|
56 | 56 | (defun evil-next-thing (count &optional beg end type inclusive)
|
57 | 57 | (ignore-errors
|
58 | 58 | (save-excursion
|
| 59 | + (message (concat "prefix was: " (number-to-string count))) |
59 | 60 | (call-interactively 'sp-select-next-thing count)
|
60 | 61 | (if (> (point) (mark))
|
61 | 62 | (exchange-point-and-mark))
|
|
112 | 113 | (define-key evil-inner-text-objects-map "N" 'evil-i-previous-thing)
|
113 | 114 |
|
114 | 115 | ;; 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)))) |
118 | 124 |
|
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) |
121 | 130 |
|
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) |
124 | 133 |
|
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) |
127 | 136 |
|
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) |
129 | 139 |
|
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) |
132 | 141 |
|
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) |
137 | 144 |
|
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) |
140 | 149 |
|
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)))) |
143 | 155 |
|
144 | 156 | ;; allow quick repetition since normal state key chains are awkward
|
145 | 157 | (defun evil-smart-smartparens-move ()
|
|
0 commit comments