aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2018-09-16 23:54:04 -0400
committerStefan Monnier2018-09-16 23:54:04 -0400
commit75ab41d00d97c4de1ca343ce5273d1aad4975f37 (patch)
tree74806b68f69457e342ba956672d9b1314b9b2c5b
parent3a2ffa62a7e491fda1083cbedb165a3e49fd21c6 (diff)
downloademacs-75ab41d00d97c4de1ca343ce5273d1aad4975f37.tar.gz
emacs-75ab41d00d97c4de1ca343ce5273d1aad4975f37.zip
* lisp/delsel.el (minibuffer-keyboard-quit): Remove old redundant code.
The various minibuffer maps all inherit from minibuffer-local-map nowadays, so a single binding in it is all it takes.
-rw-r--r--lisp/delsel.el8
1 files changed, 0 insertions, 8 deletions
diff --git a/lisp/delsel.el b/lisp/delsel.el
index a3c29349471..9582272d184 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -294,18 +294,10 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
294 (abort-recursive-edit))) 294 (abort-recursive-edit)))
295 295
296(define-key minibuffer-local-map "\C-g" 'minibuffer-keyboard-quit) 296(define-key minibuffer-local-map "\C-g" 'minibuffer-keyboard-quit)
297(define-key minibuffer-local-ns-map "\C-g" 'minibuffer-keyboard-quit)
298(define-key minibuffer-local-completion-map "\C-g" 'minibuffer-keyboard-quit)
299(define-key minibuffer-local-must-match-map "\C-g" 'minibuffer-keyboard-quit)
300(define-key minibuffer-local-isearch-map "\C-g" 'minibuffer-keyboard-quit)
301 297
302(defun delsel-unload-function () 298(defun delsel-unload-function ()
303 "Unload the Delete Selection library." 299 "Unload the Delete Selection library."
304 (define-key minibuffer-local-map "\C-g" 'abort-recursive-edit) 300 (define-key minibuffer-local-map "\C-g" 'abort-recursive-edit)
305 (define-key minibuffer-local-ns-map "\C-g" 'abort-recursive-edit)
306 (define-key minibuffer-local-completion-map "\C-g" 'abort-recursive-edit)
307 (define-key minibuffer-local-must-match-map "\C-g" 'abort-recursive-edit)
308 (define-key minibuffer-local-isearch-map "\C-g" 'abort-recursive-edit)
309 (dolist (sym '(self-insert-command insert-char quoted-insert yank 301 (dolist (sym '(self-insert-command insert-char quoted-insert yank
310 clipboard-yank insert-register newline-and-indent 302 clipboard-yank insert-register newline-and-indent
311 reindent-then-newline-and-indent newline open-line)) 303 reindent-then-newline-and-indent newline open-line))