Updating Doom Emacs.

.emacs.d/modules/lang/common-lisp/config.el

@@ -8,38 +8,45 @@
 ;;
 ;; packages
 
+;;;###package lisp-mode
 (defvar inferior-lisp-program "sbcl")
-
-(after! lisp-mode
-  (set-repl-handler! 'lisp-mode #'sly-mrepl)
-  (set-eval-handler! 'lisp-mode #'sly-eval-region)
-  (set-lookup-handlers! 'lisp-mode
-    :definition #'sly-edit-definition
-    :documentation #'sly-describe-symbol)
-
-  (add-hook 'lisp-mode-hook #'rainbow-delimiters-mode))
+(add-hook 'lisp-mode-hook #'rainbow-delimiters-mode)
 
 
-(after! sly
+(use-package! sly
+  :defer t
+  :init
+  (after! lisp-mode
+    (set-repl-handler! 'lisp-mode #'sly-mrepl)
+    (set-eval-handler! 'lisp-mode #'sly-eval-region)
+    (set-lookup-handlers! 'lisp-mode
+      :definition #'sly-edit-definition
+      :documentation #'sly-describe-symbol))
+
+  ;; HACK Ensures that sly's contrib modules are loaded as soon as possible, but
+  ;;      also as late as possible, so users have an opportunity to override
+  ;;      `sly-contrib' in an `after!' block.
+  (add-hook! 'doom-after-init-modules-hook
+    (after! sly (sly-setup)))
+
+  :config
   (setq sly-mrepl-history-file-name (concat doom-cache-dir "sly-mrepl-history")
         sly-kill-without-query-p t
         sly-net-coding-system 'utf-8-unix
-        ;; Doom defaults to non-fuzzy search, because it is slower and less
-        ;; precise. Change this to `sly-flex-completions' for fuzzy completion
+        ;; Doom defaults to non-fuzzy search, because it is faster and more
+        ;; precise (but requires more keystrokes). Change this to
+        ;; `sly-flex-completions' for fuzzy completion
         sly-complete-symbol-function 'sly-simple-completions)
 
   (set-popup-rules!
     '(("^\\*sly-mrepl"       :vslot 2 :size 0.3 :quit nil :ttl nil)
       ("^\\*sly-compilation" :vslot 3 :ttl nil)
       ("^\\*sly-traces"      :vslot 4 :ttl nil)
+      ("^\\*sly-description" :vslot 5 :size 0.3 :ttl 0)
       ;; Do not display debugger or inspector buffers in a popup window. These
       ;; buffers are meant to be displayed with sufficient vertical space.
       ("^\\*sly-\\(?:db\\|inspector\\)" :ignore t)))
 
-  (sp-with-modes '(sly-mrepl-mode)
-    (sp-local-pair "'" "'" :actions nil)
-    (sp-local-pair "`" "`" :actions nil))
-
   (defun +common-lisp--cleanup-sly-maybe-h ()
     "Kill processes and leftover buffers when killing the last sly buffer."
     (unless (cl-loop for buf in (delq (current-buffer) (buffer-list))
@@ -66,26 +73,39 @@
             ((message "WARNING: Couldn't find `inferior-lisp-program' (%s)"
                       inferior-lisp-program)))))
 
-  (map! :localleader
-        :map lisp-mode-map
-        :desc "Sly"          "'" #'sly
-        :desc "Sly (ask)"    ";" (λ!! #'sly '-)
-        :desc "Expand macro" "m" #'macrostep-expand
-        (:prefix ("c" . "compile")
+  (map! (:map sly-db-mode-map
+         :n "gr" #'sly-db-restart-frame)
+        (:map sly-inspector-mode-map
+         :n "gb" #'sly-inspector-pop
+         :n "gr" #'sly-inspector-reinspect
+         :n "gR" #'sly-inspector-fetch-all
+         :n "K"  #'sly-inspector-describe-inspectee)
+        (:map sly-xref-mode-map
+         :n "gr" #'sly-recompile-xref
+         :n "gR" #'sly-recompile-all-xrefs)
+        (:map lisp-mode-map
+         :n "gb" #'sly-pop-find-definition-stack)
+
+        (:localleader
+         :map lisp-mode-map
+         :desc "Sly"          "'" #'sly
+         :desc "Sly (ask)"    ";" (λ!! #'sly '-)
+         :desc "Expand macro" "m" #'macrostep-expand
+         (:prefix ("c" . "compile")
           :desc "Compile file"          "c" #'sly-compile-file
           :desc "Compile/load file"     "C" #'sly-compile-and-load-file
           :desc "Compile toplevel form" "f" #'sly-compile-defun
           :desc "Load file"             "l" #'sly-load-file
           :desc "Remove notes"          "n" #'sly-remove-notes
           :desc "Compile region"        "r" #'sly-compile-region)
-        (:prefix ("e" . "evaluate")
-          :desc "Evaulate buffer"     "b" #'sly-eval-buffer
+         (:prefix ("e" . "evaluate")
+          :desc "Evaluate buffer"     "b" #'sly-eval-buffer
           :desc "Evaluate last"       "e" #'sly-eval-last-expression
           :desc "Evaluate/print last" "E" #'sly-eval-print-last-expression
           :desc "Evaluate defun"      "f" #'sly-eval-defun
           :desc "Undefine function"   "F" #'sly-undefine-function
           :desc "Evaluate region"     "r" #'sly-eval-region)
-        (:prefix ("g" . "goto")
+         (:prefix ("g" . "goto")
           :desc "Go back"              "b" #'sly-pop-find-definition-stack
           :desc "Go to"                "d" #'sly-edit-definition
           :desc "Go to (other window)" "D" #'sly-edit-definition-other-window
@@ -93,7 +113,7 @@
           :desc "Previous note"        "N" #'sly-previous-note
           :desc "Next sticker"         "s" #'sly-stickers-next-sticker
           :desc "Previous sticker"     "S" #'sly-stickers-prev-sticker)
-        (:prefix ("h" . "help")
+         (:prefix ("h" . "help")
           :desc "Who calls"               "<" #'sly-who-calls
           :desc "Calls who"               ">" #'sly-calls-who
           :desc "Lookup format directive" "~" #'hyperspec-lookup-format
@@ -108,22 +128,22 @@
           :desc "Who references"          "r" #'sly-who-references
           :desc "Who specializes"         "s" #'sly-who-specializes
           :desc "Who sets"                "S" #'sly-who-sets)
-        (:prefix ("r" . "repl")
+         (:prefix ("r" . "repl")
           :desc "Clear REPL"         "c" #'sly-mrepl-clear-repl
           :desc "Quit connection"    "q" #'sly-quit-lisp
           :desc "Restart connection" "r" #'sly-restart-inferior-lisp
           :desc "Sync REPL"          "s" #'sly-mrepl-sync)
-        (:prefix ("s" . "stickers")
+         (:prefix ("s" . "stickers")
           :desc "Toggle breaking stickers" "b" #'sly-stickers-toggle-break-on-stickers
           :desc "Clear defun stickers"     "c" #'sly-stickers-clear-defun-stickers
           :desc "Clear buffer stickers"    "C" #'sly-stickers-clear-buffer-stickers
           :desc "Fetch stickers"           "f" #'sly-stickers-fetch
           :desc "Replay stickers"          "r" #'sly-stickers-replay
           :desc "Add/remove sticker"       "s" #'sly-stickers-dwim)
-        (:prefix ("t" . "trace")
+         (:prefix ("t" . "trace")
           :desc "Toggle"         "t" #'sly-toggle-trace-fdefinition
           :desc "Toggle (fancy)" "T" #'sly-toggle-fancy-trace
-          :desc "Untrace all"    "u" #'sly-untrace-all))
+          :desc "Untrace all"    "u" #'sly-untrace-all)))
 
   (when (featurep! :editor evil +everywhere)
     (add-hook 'sly-mode-hook #'evil-normalize-keymaps)))
@@ -132,4 +152,4 @@
 (use-package! sly-repl-ansi-color
   :defer t
   :init
-  (add-to-list 'sly-contribs 'sly-repl-ansi-color nil #'eq))
+  (add-to-list 'sly-contribs 'sly-repl-ansi-color))

.emacs.d/modules/lang/common-lisp/packages.el

@@ -1,6 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; lang/common-lisp/packages.el
 
-(package! sly)
-(package! sly-macrostep)
-(package! sly-repl-ansi-color)
+(package! sly :pin "1382bda945")
+(package! sly-macrostep :pin "5113e4e926")
+(package! sly-repl-ansi-color :pin "b9cd52d1cf")