Clean up a bit the Common Lisp module

modules/prelude-common-lisp.el

@@ -42,40 +42,42 @@
 ;; Open files with .cl extension in lisp-mode
 (add-to-list 'auto-mode-alist '("\\.cl\\'" . lisp-mode))
 
-;; a list of alternative Common Lisp implementations that can be
-;; used with SLIME. Note that their presence render
-;; inferior-lisp-program useless. This variable holds a list of
-;; programs and if you invoke SLIME with a negative prefix
-;; argument, M-- M-x slime, you can select a program from that list.
-(setq slime-lisp-implementations
-      '((ccl ("ccl"))
-        (clisp ("clisp" "-q"))
-        (cmucl ("cmucl" "-quiet"))
-        (sbcl ("sbcl" "--noinform") :coding-system utf-8-unix)))
-
-;; select the default value from slime-lisp-implementations
-(if (and (eq system-type 'darwin)
-         (executable-find "ccl"))
-    ;; default to Clozure CL on macOS
-    (setq slime-default-lisp 'ccl)
-  ;; default to SBCL on Linux and Windows
-  (setq slime-default-lisp 'sbcl))
-
-;; Add fancy slime contribs
-(setq slime-contribs '(slime-fancy slime-cl-indent))
-
 (add-hook 'lisp-mode-hook (lambda () (run-hooks 'prelude-lisp-coding-hook)))
-;; rainbow-delimeters messes up colors in slime-repl, and doesn't seem to work
-;; anyway, so we won't use prelude-lisp-coding-defaults.
-(add-hook 'slime-repl-mode-hook (lambda ()
-                                  (smartparens-strict-mode +1)
-                                  (whitespace-mode -1)))
 
 (with-eval-after-load "slime"
+  ;; a list of alternative Common Lisp implementations that can be
+  ;; used with SLIME. Note that their presence render
+  ;; inferior-lisp-program useless. This variable holds a list of
+  ;; programs and if you invoke SLIME with a negative prefix
+  ;; argument, M-- M-x slime, you can select a program from that list.
+  (setq slime-lisp-implementations
+        '((ccl ("ccl"))
+          (clisp ("clisp" "-q"))
+          (cmucl ("cmucl" "-quiet"))
+          (sbcl ("sbcl" "--noinform") :coding-system utf-8-unix)))
+
+  ;; select the default value from slime-lisp-implementations
+  (if (and (eq system-type 'darwin)
+           (executable-find "ccl"))
+      ;; default to Clozure CL on macOS
+      (setq slime-default-lisp 'ccl)
+    ;; default to SBCL on Linux and Windows
+    (setq slime-default-lisp 'sbcl))
+
+  ;; Add fancy slime contribs
+  (setq slime-contribs '(slime-fancy slime-cl-indent))
+
   (setq slime-complete-symbol-function 'slime-fuzzy-complete-symbol
         slime-fuzzy-completion-in-place t
         slime-enable-evaluate-in-emacs t
         slime-autodoc-use-multiline-p t)
+
+  ;; rainbow-delimeters messes up colors in slime-repl, and doesn't seem to work
+  ;; anyway, so we won't use prelude-lisp-coding-defaults.
+  (add-hook 'slime-repl-mode-hook (lambda ()
+                                    (smartparens-strict-mode +1)
+                                    (whitespace-mode -1)))
+
   (define-key slime-mode-map (kbd "C-c C-s") 'slime-selector))
 
 (provide 'prelude-common-lisp)