changeset 92747:98f0d29f01c5

(minibuffer-local-map): Use the same command for the "Quit" menu as used for the C-g key, so the shortcut displayed is C-g. Prefer RET over C-j for exit-minibuffer.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 11 Mar 2008 22:02:46 +0000
parents 26e567ab8830
children ef656c281e1e
files lisp/ChangeLog lisp/menu-bar.el
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue Mar 11 20:48:57 2008 +0000
+++ b/lisp/ChangeLog	Tue Mar 11 22:02:46 2008 +0000
@@ -1,5 +1,9 @@
 2008-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* menu-bar.el (minibuffer-local-map): Use the same command for the
+	"Quit" menu as used for the C-g key, so the shortcut displayed is C-g.
+	Prefer RET over C-j for exit-minibuffer.
+
 	* files.el (display-buffer-other-frame): Eliminate problematic code.
 
 	* menu-bar.el (menu-bar-update-buffers-maxbuf): Remove.
--- a/lisp/menu-bar.el	Tue Mar 11 20:48:57 2008 +0000
+++ b/lisp/menu-bar.el	Tue Mar 11 22:02:46 2008 +0000
@@ -1714,10 +1714,11 @@
 
 (let ((map minibuffer-local-map))
   (define-key map [menu-bar minibuf quit]
-    (list 'menu-item "Quit" 'keyboard-escape-quit
+    (list 'menu-item "Quit" 'abort-recursive-edit
 	  :help "Abort input and exit minibuffer"))
   (define-key map [menu-bar minibuf return]
     (list 'menu-item "Enter" 'exit-minibuffer
+          :key-sequence "\r"
 	  :help "Terminate input and exit minibuffer"))
   (define-key map [menu-bar minibuf isearch-forward]
     (list 'menu-item "Isearch History Forward" 'isearch-forward