branch: elpa/slime
commit b2ee8a8c991c5195804e7f2c2f38482f3a6f12b2
Author: Stas Boukarev <stass...@gmail.com>
Commit: Stas Boukarev <stass...@gmail.com>
Don't lock the SWANK package.
Some third party software interns stuff there.
---
slime-tests.el | 1 -
swank.lisp | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/slime-tests.el b/slime-tests.el
index b0696c919f..026da75738 100644
--- a/slime-tests.el
+++ b/slime-tests.el
@@ -60,7 +60,6 @@ Exits Emacs when finished. The exit code is the number of
failed tests."
(when noninteractive
(kill-emacs 252)))))
(slime-sync-to-top-level 30)
- (slime-eval `(swank/backend:unlock-package :swank))
(let* ((selector (if randomize
`(member ,@(slime-shuffle-list
(ert-select-tests (or test-name t) t)))
diff --git a/swank.lisp b/swank.lisp
index b3c4db02d9..ac49b54731 100644
--- a/swank.lisp
+++ b/swank.lisp
@@ -2540,7 +2540,7 @@ Record compiler notes signalled as `compiler-condition's."
(defslimefun swank-require (modules &optional filename)
"Load the module MODULE."
- (with-unlocked-packages (swank swank/backend)
+ (with-unlocked-packages (swank/backend)
(dolist (module (ensure-list modules))
(unless (member (string module) *modules* :test #'string=)
(catch 'dont-load
@@ -3897,7 +3897,7 @@ Collisions are caused because package information is
ignored."
(pushnew :swank *features*)
(setq *swank-wire-protocol-version* version)
(setq *load-path* load-path)
- (loop for x in '(swank swank/backend swank/rpc swank/match swank-mop
swank/gray)
+ (loop for x in '(swank/backend swank/rpc swank/match swank-mop swank/gray)
do (lock-package x)))
(defun init ()
