diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-10-27 13:21:21 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-10-27 13:21:21 -0400 |
| commit | 2aaced16866f8b17ee109a0c5682b3896e713f5c (patch) | |
| tree | 28ae345c18b03bac46f962b5a1036103b4896edd /lisp/simple.el | |
| parent | 113ff954dbcd24325bd674b7294d54a7c8394d42 (diff) | |
| download | emacs-2aaced16866f8b17ee109a0c5682b3896e713f5c.tar.gz | |
* lisp/loadup.el: Load minibuffer after cl-generic
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.
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index 338f3e3fd89..5502cd49aa4 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -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." |