mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(minibuffer-local-*map): Take inheritance into account.

Browse source
This commit is contained in:
Stefan Monnier 2001-10-12 19:59:43 +00:00
parent 01f9ba177c
commit 32993295b9
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,5 +1,12 @@
2001-10-12 Stefan Monnier <monnier@cs.yale.edu>
* 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.

16
lisp/menu-bar.el
View file

@ -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"))