Reorganize emacs-lisp setup

1 files changed, 17 insertions, 13 deletions

@@ -598,13 +598,12 @@ AKA, DO NOT USE THIS FUNCTION!!!"
                          (error (elfeed-show-prev))))))))
 
 (setup elisp-mode
-  (:option eval-expression-print-length nil
-           eval-expression-print-level nil
-           lisp-indent-function #'lisp-indent-function)
+  (:with-mode emacs-lisp-mode ;; -_-
+    (:option eval-expression-print-length nil
+             eval-expression-print-level nil
+             lisp-indent-function #'lisp-indent-function)
 
-  (:with-mode emacs-lisp-mode
-    (:local-set lexical-binding t
-                (append imenu-generic-expression)
+    (:local-set (append imenu-generic-expression)
                 `("Setup"
                   ,(rx (seq
                         (group bol (* space) "(setup" (+ space))
@@ -618,13 +617,18 @@ AKA, DO NOT USE THIS FUNCTION!!!"
     ;; Emulate slime's eval binds
     (:bind "C-c C-c" #'eval-defun
            "C-c C-k" #'acdw/eval-region-or-buffer
-           "C-c C-z" #'ielm))
-  
-  ;; Add advice to pulse evaluated regions
-  (:advise eval-region :around
-           (defun eval-region@pulse (fn beg end &rest args)
-             (pulse-momentary-highlight-region beg end)
-             (apply fn beg end args))))
+           "C-c C-z" #'ielm)
+    
+    ;; Add advice to pulse evaluated regions
+    (:advise eval-region :around
+             (defun eval-region@pulse (fn beg end &rest args)
+               (pulse-momentary-highlight-region beg end)
+               (apply fn beg end args))))
+
+  (:with-mode lisp-interaction-mode ;; -___-
+    (:bind "C-c C-c" #'eval-defun
+           "C-c C-k" #'acdw/eval-region-or-buffer
+           "C-c C-z" #'ielm)))
 
 (setup (:straight elisp-slime-nav)
   (:hook-into emacs-lisp-mode