procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/repeat.el: Detect changes in the minibuffer state (bug#47566)

Browse source 
(repeat--prev-mb): New internal variable.
(repeat-post-hook): Check the property 'repeat-map' on the symbol
from 'this-command' in addition to 'real-this-command'.  Don't allow
repeatable maps in the activated minibuffer or in the minibuffer
from another command.  Set 'repeat--prev-mb' at the end.
This commit is contained in:
Juri Linkov 2021-11-15 19:39:37 +02:00
parent 5044151486
commit c840bfe7e1
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/repeat.el
View file

@ -402,12 +402,17 @@ See `describe-repeat-maps' for a list of all repeatable commands."
(length commands) (length commands)
(length (delete-dups keymaps)))))) (length (delete-dups keymaps))))))
(defvar repeat--prev-mb '(0)
"Previous minibuffer state.")
(defun repeat-post-hook () (defun repeat-post-hook ()
"Function run after commands to set transient keymap for repeatable keys." "Function run after commands to set transient keymap for repeatable keys."
(let ((was-in-progress repeat-in-progress)) (let ((was-in-progress repeat-in-progress))
(setq repeat-in-progress nil) (setq repeat-in-progress nil)
(when repeat-mode (when repeat-mode
(let ((rep-map (or repeat-map (let ((rep-map (or repeat-map
(and (symbolp this-command)
(get this-command 'repeat-map))
(and (symbolp real-this-command) (and (symbolp real-this-command)
(get real-this-command 'repeat-map))))) (get real-this-command 'repeat-map)))))
(when rep-map (when rep-map
@ -415,9 +420,14 @@ See `describe-repeat-maps' for a list of all repeatable commands."
(setq rep-map (symbol-value rep-map))) (setq rep-map (symbol-value rep-map)))
(let ((map (copy-keymap rep-map))) (let ((map (copy-keymap rep-map)))
(when (and
;; Detect changes in the minibuffer state to allow repetitions
;; in the same minibuffer, but not when the minibuffer is activated
;; in the middle of repeating sequence (bug#47566).
(or (< (minibuffer-depth) (car repeat--prev-mb))
(eq current-minibuffer-command (cdr repeat--prev-mb)))
;; Exit when the last char is not among repeatable keys, ;; Exit when the last char is not among repeatable keys,
;; so e.g. `C-x u u' repeats undo, whereas `C-/ u' doesn't. ;; so e.g. `C-x u u' repeats undo, whereas `C-/ u' doesn't.
(when (and (zerop (minibuffer-depth)) ; avoid remapping in prompts
(or (lookup-key map (this-command-keys-vector)) (or (lookup-key map (this-command-keys-vector))
prefix-arg)) prefix-arg))
@ -449,6 +459,7 @@ See `describe-repeat-maps' for a list of all repeatable commands."
(funcall repeat-echo-function nil))))))))))) (funcall repeat-echo-function nil)))))))))))
(setq repeat-map nil) (setq repeat-map nil)
(setq repeat--prev-mb (cons (minibuffer-depth) current-minibuffer-command))
(when (and was-in-progress (not repeat-in-progress)) (when (and was-in-progress (not repeat-in-progress))
(when repeat-exit-timer (when repeat-exit-timer
(cancel-timer repeat-exit-timer) (cancel-timer repeat-exit-timer)