Mercurial > emacs

changeset 39844:0433563f559d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(minibuffer-local-*map): Take inheritance into account.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 12 Oct 2001 19:59:32 +0000
parents a292df89e830
children e7ed51a0fc32
files lisp/menu-bar.el
diffstat 1 files changed, 5 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/menu-bar.el	Fri Oct 12 19:25:04 2001 +0000
+++ b/lisp/menu-bar.el	Fri Oct 12 19:59:32 2001 +0000
@@ -1170,16 +1170,14 @@
 
 ;;; Set up a menu bar menu for the minibuffer.
 
-(dolist (map (list minibuffer-local-ns-map
-		   minibuffer-local-must-match-map
-		   minibuffer-local-isearch-map
-		   minibuffer-local-map
+(dolist (map (list minibuffer-local-map
+		   ;; This shouldn't be necessary, but there's a funny
+		   ;; bug in keymap.c that I don't understand yet.  -stef
 		   minibuffer-local-completion-map))
   (define-key map [menu-bar minibuf]
     (cons "Minibuf" (make-sparse-keymap "Minibuf"))))
 
-(dolist (map (list minibuffer-local-must-match-map
-		   minibuffer-local-completion-map))
+(let ((map minibuffer-local-completion-map))
   (define-key map [menu-bar minibuf ?\?]
     (list 'menu-item "List Completions" 'minibuffer-completion-help
 	  :help "Display all possible completions"))
@@ -1190,11 +1188,7 @@
     (list 'menu-item "Complete" 'minibuffer-complete
 	  :help "Complete as far as possible")))
 
-(dolist (map (list minibuffer-local-ns-map
-		   minibuffer-local-must-match-map
-		   minibuffer-local-isearch-map
-		   minibuffer-local-map
-		   minibuffer-local-completion-map))
+(let ((map minibuffer-local-map))
   (define-key map [menu-bar minibuf quit]
     (list 'menu-item "Quit" 'keyboard-escape-quit
 	  :help "Abort input and exit minibuffer"))