From 32993295b900acebb2010323bdb3f7c1b6cd7d8a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 12 Oct 2001 19:59:43 +0000 Subject: [PATCH] (minibuffer-local-*map): Take inheritance into account. --- lisp/ChangeLog | 7 +++++++ lisp/menu-bar.el | 16 +++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 237b8879aa5..97e109445da 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ 2001-10-12 Stefan Monnier + * menu-bar.el (minibuffer-local-*map): Take inheritance into account. + + * simple.el (minibuffer-local*-map): Remove redundant bindings. + + * bindings.el (minibuffer-local-map): Also bind next, C-n, C-s, prior, + C-p and C-r. Remove redundant bindings from inheriting maps. + * progmodes/cperl-mode.el: Merged in changes from v4.32. After 4.23 and: After 4.24: (cperl-contract-levels): Restore position. diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 00d009df9a8..6a9da349a17 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1170,16 +1170,14 @@ key (or menu-item)")) ;;; 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 @@ key (or menu-item)")) (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")) -- 2.39.2