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

Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/emacs into emacs-29

Browse source
This commit is contained in:
Eli Zaretskii 2023-02-13 20:12:32 +02:00
commit 13bcff3da5
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lisp/repeat.el
View file

@ -359,8 +359,8 @@ This property can override the value of this variable."
:group 'repeat :group 'repeat
:version "28.1") :version "28.1")
(defvar repeat-exit-function nil (defvar repeat--transient-exitfun nil
"Function that exits the repeating sequence.") "Function returned by `set-transient-map'.")
(defvar repeat-exit-timer nil (defvar repeat-exit-timer nil
"Timer activated after the last key typed in the repeating key sequence.") "Timer activated after the last key typed in the repeating key sequence.")
@ -517,9 +517,9 @@ See `describe-repeat-maps' for a list of all repeatable commands."
'ignore)) 'ignore))
(setq repeat-in-progress t) (setq repeat-in-progress t)
(repeat--exit) (repeat--clear-prev)
(let ((exitfun (set-transient-map map))) (let ((exitfun (set-transient-map map)))
(setq repeat-exit-function exitfun) (setq repeat--transient-exitfun exitfun)
(let* ((prop (repeat--command-property 'repeat-exit-timeout)) (let* ((prop (repeat--command-property 'repeat-exit-timeout))
(timeout (unless (eq prop 'no) (or prop repeat-exit-timeout)))) (timeout (unless (eq prop 'no) (or prop repeat-exit-timeout))))
@ -538,17 +538,17 @@ See `describe-repeat-maps' for a list of all repeatable commands."
This function can be used to force exit of repetition while it's active." This function can be used to force exit of repetition while it's active."
(interactive) (interactive)
(setq repeat-in-progress nil) (setq repeat-in-progress nil)
(repeat--exit) (repeat--clear-prev)
(funcall repeat-echo-function nil)) (funcall repeat-echo-function nil))
(defun repeat--exit () (defun repeat--clear-prev ()
"Internal function to clean up previously set exit function and timer." "Internal function to clean up previously set exit function and timer."
(when repeat-exit-timer (when repeat-exit-timer
(cancel-timer repeat-exit-timer) (cancel-timer repeat-exit-timer)
(setq repeat-exit-timer nil)) (setq repeat-exit-timer nil))
(when repeat-exit-function (when repeat--transient-exitfun
(funcall repeat-exit-function) (funcall repeat--transient-exitfun)
(setq repeat-exit-function nil))) (setq repeat--transient-exitfun nil)))
(defun repeat-echo-message-string (keymap) (defun repeat-echo-message-string (keymap)
"Return a string with the list of repeating keys in KEYMAP." "Return a string with the list of repeating keys in KEYMAP."