Skip to content

Commit 31810fb

Browse files
committed
Add smartparens bindings to minibuffer
1 parent c803f7c commit 31810fb

File tree

1 file changed

+32
-20
lines changed

1 file changed

+32
-20
lines changed

modules/config-smartparens.el

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
(defun evil-next-thing (count &optional beg end type inclusive)
5757
(ignore-errors
5858
(save-excursion
59+
(message (concat "prefix was: " (number-to-string count)))
5960
(call-interactively 'sp-select-next-thing count)
6061
(if (> (point) (mark))
6162
(exchange-point-and-mark))
@@ -112,34 +113,45 @@
112113
(define-key evil-inner-text-objects-map "N" 'evil-i-previous-thing)
113114

114115
;; define top level motions bindings
115-
(define-key sp-keymap (kbd "C-M-f") 'evil-forward-sexp)
116-
(define-key sp-keymap (kbd "C-M-b") 'evil-backward-sexp)
117-
(define-key sp-keymap (kbd "C-M-k") 'sp-kill-sexp)
116+
(cl-macrolet
117+
((sp-define-bindings (key func)
118+
`(progn
119+
(define-key sp-keymap ,key ,func)
120+
(define-key minibuffer-local-map ,key ,func)
121+
(define-key minibuffer-local-ns-map ,key ,func)
122+
(define-key minibuffer-local-completion-map ,key ,func)
123+
(define-key minibuffer-local-must-match-map ,key ,func))))
118124

119-
(define-key sp-keymap (kbd "C-M-d") 'evil-down-sexp)
120-
(define-key sp-keymap (kbd "C-M-a") 'evil-backward-down-sexp)
125+
(generate-calls sp-define-bindings
126+
(
127+
((kbd "C-M-f") 'evil-forward-sexp)
128+
((kbd "C-M-b") 'evil-backward-sexp)
129+
((kbd "C-M-k") 'sp-kill-sexp)
121130

122-
(define-key sp-keymap (kbd "C-M-e") 'evil-up-sexp)
123-
(define-key sp-keymap (kbd "C-M-u") 'evil-backward-up-sexp)
131+
((kbd "C-M-d") 'evil-down-sexp)
132+
((kbd "C-M-a") 'evil-backward-down-sexp)
124133

125-
(define-key sp-keymap (kbd "C-M-n") 'evil-next-sexp)
126-
(define-key sp-keymap (kbd "C-M-p") 'evil-previous-sexp)
134+
((kbd "C-M-e") 'evil-up-sexp)
135+
((kbd "C-M-u") 'evil-backward-up-sexp)
127136

128-
(define-key sp-keymap (kbd "C-M-t") 'sp-transpose-sexp)
137+
((kbd "C-M-n") 'evil-next-sexp)
138+
((kbd "C-M-p") 'evil-previous-sexp)
129139

130-
(define-key sp-keymap (kbd "M-(") 'sp-select-previous-thing)
131-
(define-key sp-keymap (kbd "M-)") 'sp-select-next-thing)
140+
((kbd "C-M-t") 'sp-transpose-sexp)
132141

133-
(define-key sp-keymap (kbd "C-+") 'sp-rewrap-sexp)
134-
(define-key sp-keymap (kbd "M-<delete>") 'sp-kill-sexp)
135-
(define-key sp-keymap (kbd "M-<backspace>") 'sp-backward-kill-sexp)
136-
(define-key sp-keymap (kbd "S-<backspace>") 'sp-backward-unwrap-sexp)
142+
((kbd "M-(") 'sp-select-previous-thing)
143+
((kbd "M-)") 'sp-select-next-thing)
137144

138-
(define-key sp-keymap (kbd "C-M-,") 'sp-forward-slurp-sexp)
139-
(define-key sp-keymap (kbd "C-M-.") 'sp-forward-barf-sexp)
145+
((kbd "C-+") 'sp-rewrap-sexp)
146+
((kbd "M-<delete>") 'sp-kill-sexp)
147+
((kbd "M-<backspace>") 'sp-backward-kill-sexp)
148+
((kbd "S-<backspace>") 'sp-backward-unwrap-sexp)
140149

141-
(define-key sp-keymap (kbd "M-<") 'sp-backward-slurp-sexp)
142-
(define-key sp-keymap (kbd "M->") 'sp-backward-barf-sexp)
150+
((kbd "C-M-,") 'sp-forward-slurp-sexp)
151+
((kbd "C-M-.") 'sp-forward-barf-sexp)
152+
153+
((kbd "M-<") 'sp-backward-slurp-sexp)
154+
((kbd "M->") 'sp-backward-barf-sexp))))
143155

144156
;; allow quick repetition since normal state key chains are awkward
145157
(defun evil-smart-smartparens-move ()

0 commit comments

Comments
 (0)