git.fiddlerwoaroof.com
Browse code

emacs: improve paredit keybindings for consistency with code

Ed Langley authored on 03/08/2019 19:11:52
Showing 1 changed files
... ...
@@ -78,25 +78,35 @@
78 78
 
79 79
   (progn ;; wrapping
80 80
     (define-key evil-normal-state-map ",W" 'sp-wrap-round)
81
-    (define-key cider-mode-map (kbd "C-, W") 'sp-wrap-round)
82
-    (define-key cider-mode-map (kbd "C-, C-W") 'sp-wrap-round)
81
+    (define-key evil-normal-state-map (kbd "C-, W") 'sp-wrap-round)
82
+    (define-key evil-normal-state-map (kbd "C-, C-W") 'sp-wrap-round)
83 83
 
84 84
     (define-key evil-normal-state-map ",w(" 'sp-wrap-round)
85 85
     (define-key evil-normal-state-map ",w)" 'sp-wrap-round)
86
-    (define-key cider-mode-map (kbd "C-, w (") 'sp-wrap-round)
87
-    (define-key cider-mode-map (kbd "C-, w )") 'sp-wrap-round)
86
+    (define-key global-map (kbd "C-, (") 'sp-wrap-round)
87
+    (define-key global-map (kbd "C-, C-(") 'sp-wrap-round)
88
+    (define-key global-map (kbd "C-, )") 'sp-wrap-round)
89
+    (define-key global-map (kbd "C-, C-)") 'sp-wrap-round)
88 90
 
89 91
     (define-key evil-normal-state-map ",w$" 'wrap-in-dollar-brace)
90
-
92
+    (define-key evil-normal-state-map (kbd "C-, $") 'wrap-in-dollar-brace)
91 93
     (define-key evil-normal-state-map ",w{" 'sp-wrap-curly)
92 94
     (define-key evil-normal-state-map ",w}" 'sp-wrap-curly)
93
-    (define-key cider-mode-map (kbd "C-, w {") 'sp-wrap-curly)
94
-    (define-key cider-mode-map (kbd "C-, w }") 'sp-wrap-curly)
95
+    (define-key global-map (kbd "C-, {") 'sp-wrap-curly)
96
+    (define-key global-map (kbd "C-, C-{") 'sp-wrap-curly)
97
+    (define-key global-map (kbd "C-, }") 'sp-wrap-curly)
98
+    (define-key global-map (kbd "C-, C-}") 'sp-wrap-curly)
99
+    (define-key global-map (kbd "C-, w {") 'sp-wrap-curly)
100
+    (define-key global-map (kbd "C-, w }") 'sp-wrap-curly)
95 101
 
96 102
     (define-key evil-normal-state-map ",w[" 'sp-wrap-square)
97 103
     (define-key evil-normal-state-map ",w]" 'sp-wrap-square)
98
-    (define-key cider-mode-map (kbd "C-, w [") 'sp-wrap-square)
99
-    (define-key cider-mode-map (kbd "C-, w ]") 'sp-wrap-square)
104
+    (define-key global-map (kbd "C-, w [") 'sp-wrap-square)
105
+    (define-key global-map (kbd "C-, <escape>") 'sp-wrap-square)
106
+    (define-key global-map (kbd "C-, [") 'sp-wrap-square)
107
+    (define-key global-map (kbd "C-, w ]") 'sp-wrap-square)
108
+    (define-key global-map (kbd "C-, C-]") 'sp-wrap-square)
109
+    (define-key global-map (kbd "C-, ]") 'sp-wrap-square)
100 110
 
101 111
     (define-key evil-normal-state-map ",w\"" 'wrap-with-doublequote)
102 112
     (define-key cider-mode-map (kbd "C-, w \"") 'sp-wrap-doublequote))