masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-19 02:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* lisp/loadup.el: Load minibuffer after cl-generic

Browse source 
This is so minibuffer.el can make use of cl-generic

* lisp/minibuffer.el (minibuffer-local-completion-map):
Move switch-to-completions bindings here from...
* lisp/simple.el (minibuffer-local-completion-map): ... here.
This commit is contained in:
Stefan Monnier 2019-10-27 13:21:21 -04:00
parent 113ff954db
commit 2aaced1686
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/simple.el
View file

@ -3336,7 +3336,7 @@ to `shell-command-history'."
(shell-completion-vars)
(set (make-local-variable 'minibuffer-default-add-function)
'minibuffer-default-add-shell-commands))
(apply 'read-from-minibuffer prompt initial-contents
(apply #'read-from-minibuffer prompt initial-contents
minibuffer-local-shell-command-map
nil
(or hist 'shell-command-history)
@ -8494,10 +8494,7 @@ Called from `temp-buffer-show-hook'."
"In this buffer, type \\[choose-completion] to \
select the completion near point.\n\n"))))))
(add-hook 'completion-setup-hook 'completion-setup-function)
(define-key minibuffer-local-completion-map [prior] 'switch-to-completions)
(define-key minibuffer-local-completion-map "\M-v" 'switch-to-completions)
(add-hook 'completion-setup-hook #'completion-setup-function)
(defun switch-to-completions ()
"Select the completion list window."