13a0c17755
Since no official version has been released since 1.0.43, update to the latest
commit (after some tests). Tweak the version number to avoid bumping PORTEPOCH.
Lots of small changes, including fixes and customization enhancements to the
REPL, adaptations for future Emacs version, a bunch of fixes for ABCL and clasp.
Changelog: eb67be96...e6bc13d9
PR: 271652
46 lines
1.8 KiB
EmacsLisp
46 lines
1.8 KiB
EmacsLisp
--- sly.el.orig 2023-05-23 12:54:52 UTC
|
|
+++ sly.el
|
|
@@ -7475,22 +7475,30 @@ can be found."
|
|
;;;###autoload
|
|
(add-hook 'lisp-mode-hook 'sly-editing-mode)
|
|
|
|
-(cond
|
|
- ((or (not (memq 'slime-lisp-mode-hook lisp-mode-hook))
|
|
- noninteractive
|
|
- (prog1
|
|
- (y-or-n-p "[sly] SLIME detected in `lisp-mode-hook', causes keybinding conflicts. Remove it for this Emacs session?")
|
|
- (warn "To restore SLIME in this session, customize `lisp-mode-hook'
|
|
-and replace `sly-editing-mode' with `slime-lisp-mode-hook'.")))
|
|
- (remove-hook 'lisp-mode-hook 'slime-lisp-mode-hook)
|
|
+(let ((proceed-p
|
|
+ (if noninteractive
|
|
+ (lambda () t)
|
|
+ (let (asked resp)
|
|
+ (lambda ()
|
|
+ (unless asked
|
|
+ (setq resp
|
|
+ (y-or-n-p
|
|
+ (eval-when-compile
|
|
+ (concat "[sly] SLIME detected. Try to disable it "
|
|
+ "for this Emacs session?")))
|
|
+ asked t))
|
|
+ resp)))))
|
|
+ (when (and (memq 'slime-lisp-mode-hook lisp-mode-hook)
|
|
+ (funcall proceed-p))
|
|
+ (warn "To restore SLIME in this session, customize `lisp-mode-hook' and
|
|
+replace `sly-editing-mode' with `slime-lisp-mode-hook'.")
|
|
+ (remove-hook 'lisp-mode-hook 'slime-lisp-mode-hook))
|
|
(dolist (buffer (buffer-list))
|
|
(with-current-buffer buffer
|
|
(when (eq major-mode 'lisp-mode)
|
|
- (unless sly-editing-mode (sly-editing-mode 1))
|
|
- (ignore-errors (and (featurep 'slime) (funcall 'slime-mode -1)))))))
|
|
- (t
|
|
- (warn
|
|
- "`sly.el' loaded OK. To use SLY, customize `lisp-mode-hook' and remove `slime-lisp-mode-hook'.")))
|
|
+ (when (and (boundp 'slime-mode) slime-mode (funcall proceed-p))
|
|
+ (ignore-errors (funcall 'slime-mode -1)))
|
|
+ (sly-editing-mode 1)))))
|
|
|
|
(provide 'sly)
|
|
|