Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-21 04:17:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't bind `M-X' when doing general completion

Browse source 
* lisp/minibuffer.el (minibuffer-local-must-match-map): Remove the
M-X binding here, because it's nonsensical outside
read-extended-command (bug#56741).

* lisp/simple.el (read-extended-command-mode-map)
(read-extended-command-mode): New minor mode to bind `M-X' in
read-extended-command.
(read-extended-command-1): Use it.
This commit is contained in:
Lars Ingebrigtsen 2022-07-26 15:21:28 +02:00
parent a1384cd65d
commit 015cf7824e
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/minibuffer.el
View file

@ -2760,7 +2760,6 @@ The completion method is determined by `completion-at-point-functions'."
(defvar-keymap minibuffer-local-must-match-map
:doc "Local keymap for minibuffer input with completion, for exact match."
:parent minibuffer-local-completion-map
"M-X" #'execute-extended-command-cycle
"RET" #'minibuffer-complete-and-exit
"C-j" #'minibuffer-complete-and-exit)

15
lisp/simple.el
View file

@ -2229,9 +2229,20 @@ See `extended-command-versions'."
"Alist of prompts and what the extended command predicate should be.
This is used by the \\<minibuffer-local-must-match-map>\\[execute-extended-command-cycle] command when reading an extended command.")
(defvar-keymap read-extended-command-mode-map
:doc "Local keymap added to the current map when reading an extended command."
"M-X" #'execute-extended-command-cycle)
(define-minor-mode read-extended-command-mode
"Minor mode when doing completion in `read-extended-command'.")
(defun read-extended-command (&optional prompt)
"Read command name to invoke in `execute-extended-command'.
This function uses the `read-extended-command-predicate' user option."
This function uses the `read-extended-command-predicate' user
option.
When reading the command name, the `read-extended-command-mode'
minor mode is activated."
(let ((default-predicate read-extended-command-predicate)
(read-extended-command-predicate read-extended-command-predicate)
already-typed ret)
@ -2270,6 +2281,8 @@ This function uses the `read-extended-command-predicate' user option."
(setq execute-extended-command--last-typed
(minibuffer-contents)))
nil 'local)
;; This is so that we define the `M-X' toggling command.
(read-extended-command-mode)
(setq-local minibuffer-default-add-function
(lambda ()
;; Get a command name at point in the original buffer