]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/delsel.el (minibuffer-keyboard-quit): Remove old redundant code.
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 17 Sep 2018 03:54:04 +0000 (23:54 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 17 Sep 2018 03:54:04 +0000 (23:54 -0400)
The various minibuffer maps all inherit from minibuffer-local-map nowadays,
so a single binding in it is all it takes.

lisp/delsel.el

index a3c293494713dad167894a75f8730dcae0c86d1a..9582272d1846ae70e94d02ca85786661339f893e 100644 (file)
@@ -294,18 +294,10 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
     (abort-recursive-edit)))
 
 (define-key minibuffer-local-map "\C-g" 'minibuffer-keyboard-quit)
-(define-key minibuffer-local-ns-map "\C-g" 'minibuffer-keyboard-quit)
-(define-key minibuffer-local-completion-map "\C-g" 'minibuffer-keyboard-quit)
-(define-key minibuffer-local-must-match-map "\C-g" 'minibuffer-keyboard-quit)
-(define-key minibuffer-local-isearch-map "\C-g" 'minibuffer-keyboard-quit)
 
 (defun delsel-unload-function ()
   "Unload the Delete Selection library."
   (define-key minibuffer-local-map "\C-g" 'abort-recursive-edit)
-  (define-key minibuffer-local-ns-map "\C-g" 'abort-recursive-edit)
-  (define-key minibuffer-local-completion-map "\C-g" 'abort-recursive-edit)
-  (define-key minibuffer-local-must-match-map "\C-g" 'abort-recursive-edit)
-  (define-key minibuffer-local-isearch-map "\C-g" 'abort-recursive-edit)
   (dolist (sym '(self-insert-command insert-char quoted-insert yank
                  clipboard-yank insert-register newline-and-indent
                  reindent-then-newline-and-indent newline open-line))