Clean up bindings

Move lisp-interaction-mode bindings into same add-hook statement as the other shared lisp mode hooks

Exchange special bindings for pairs with adding them to electric-pair-pairs

Change Universal argument from M-' to C-S-U (a-la using C-S-H for help)

diff --git a/init.el b/init.el
index 156f5af5e3b0d9b602af2cd087075be636c08b1d..bd4fd92d0b1e9aebe8b4520a718995398319c1ce 100644 (file)
--- a/init.el
+++ b/init.el
@@ -112,13 +112,23 @@
 (defvaralias 'cperl-indent-level 'tab-width)
 
 (add-hook 'prog-mode-hook
-         (lambda nil (keymap-local-set "<TAB>" #'tab-to-tab-stop)))
+         (lambda () (keymap-local-set "<TAB>" #'tab-to-tab-stop)))
+
+(add-hook 'text-mode-hook
+         (lambda ()
+           (keymap-set text-mode-map "<TAB>" 'self-insert-command)))
 
 (load-theme 'fully-mono-white t)
 
 (setq show-paren-delay 0
       show-paren-style 'expression)
 
+(setq electric-pair-pairs '((?\" . ?\")
+                           (?\‘ . ?\’)
+                           (?\“ . ?\”)
+                           (?\{ . ?\})
+                           (?\< . ?\>)))
+
 (set-face-attribute 'show-paren-match
                    nil
                    :foreground

diff --git a/re/re-bindings.el b/re/re-bindings.el
index eb26e705a5db23850cb7c3d9471bc63885859ef1..d864f0fcf2112566859d43b5321c14f160629572 100644 (file)
--- a/re/re-bindings.el
+++ b/re/re-bindings.el
@@ -14,6 +14,7 @@
 (keymap-global-set "C-S-K" #'kill-whole-line)
 (keymap-global-set "C-w" #'re/kill-bword-or-region)
 (keymap-global-set "C-u" (lambda () (interactive) (kill-line 0))) ; kill-line backwards
+(keymap-global-set "C-S-U" #'universal-argument) ; C-u used above
 (keymap-set key-translation-map "C-h" "<DEL>") ; Rather F1 for help, also C-S-H works
 (keymap-global-set "C-o" #'re/open-line-below)
 (keymap-global-set "M-o" #'re/open-line-above)
@@ -24,19 +25,10 @@
 (keymap-global-set "<remap> <capitalize-word>" #'capitalize-dwim) ; M-c
 (keymap-global-set "<remap> <downcase-word>" #'downcase-dwim) ; M-l
 (keymap-global-set "<remap> <upcase-word>" #'upcase-dwim) ; M-u
-(keymap-global-set "M-'" #'universal-argument) ; C-u used above
-(keymap-global-set "M-[" #'insert-pair) ; wrap region in brackets
-(keymap-global-set "M-<" #'insert-pair) ; wrap region in angle brackets
-(keymap-global-set "M-{" #'insert-pair) ; wrap region in angle brackets
-(add-hook 'text-mode-hook
-         (lambda ()
-           (keymap-set text-mode-map "<TAB>" 'self-insert-command)))
 
 ;; Wayfindiŋ
 (keymap-global-set "<home>" #'beginning-of-buffer)
 (keymap-global-set "<end>" #'end-of-buffer)
-(keymap-global-set "M-n" #'next-buffer)
-(keymap-global-set "M-p" #'previous-buffer)
 (keymap-global-set "C-." #'next-buffer)
 (keymap-global-set "C-," #'previous-buffer)
 (keymap-global-set "C-^" (lambda () (interactive) (switch-to-buffer nil))) ; toggle last two buffers
@@ -82,7 +74,7 @@
 ;; (E)Lisp
 
 (defvar *re/lisp-mode-hooks*
-  '(emacs-lisp-mode-hook lisp-mode-hook slime-mode-hook scheme-mode-hook geiser-mode-hook))
+  '(emacs-lisp-mode-hook lisp-mode-hook slime-mode-hook scheme-mode-hook geiser-mode-hook lisp-interaction-mode-hook))
 
 (dolist (hook *re/lisp-mode-hooks*)
   (add-hook hook
@@ -97,37 +89,26 @@
                          #'sedit-auto-prettify-sexp)
              (keymap-set lisp-mode-shared-map
                          "]"
-                         (re/balance-and-eval-sexp #'sedit-auto-prettify-sexp)))))
-
-(add-hook 'lisp-interaction-mode-hook
-         (lambda ()
-           (require 'sedit-mouse)
-           (acme-mouse-mode 0)
-           (sedit-mouse-mode 1)
-           (electric-pair-mode 1)
-           (keymap-set lisp-interaction-mode-map "C-M-z" #'eval-region)
-           (keymap-set lisp-interaction-mode-map
-                       "C-M-S-q"
-                       #'sedit-auto-prettify-sexp)
-           (keymap-set lisp-interaction-mode-map
-                       "]"
-                       (re/balance-and-eval-sexp #'eval-print-last-sexp))))
+                         (re/balance-and-eval-sexp #'sedit-auto-prettify-sexp))
+             (keymap-set lisp-interaction-mode-map
+                         "]"
+                         (re/balance-and-eval-sexp #'eval-print-last-sexp)))))
 
 ;; IELM
 (keymap-global-set "C-c i" #'ielm)
 
 (add-hook 'ielm-mode-hook
-         (lambda ()
-           (keymap-set inferior-emacs-lisp-mode-map
-                       "C-l"
-                       #'comint-clear-buffer)
-           (let ((eval-function #'ielm-send-input))
-             (keymap-set inferior-emacs-lisp-mode-map
-                         ")"
-                         (re/send-on-close-paren eval-function))
-             (keymap-set inferior-emacs-lisp-mode-map
-                         "]"
-                         (re/balance-and-eval-sexp eval-function)))))
+(lambda ()
+  (keymap-set inferior-emacs-lisp-mode-map
+             "C-l"
+             #'comint-clear-buffer)
+  (let ((eval-function #'ielm-send-input))
+    (keymap-set inferior-emacs-lisp-mode-map
+               ")"
+               (re/send-on-close-paren eval-function))
+    (keymap-set inferior-emacs-lisp-mode-map
+               "]"
+               (re/balance-and-eval-sexp eval-function)))))
 
 ;; Eshell
 (keymap-global-set "C-c e" #'eshell)