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

Fix repeat-mode to keep the same map symbol for repeat-continue

Browse source 
* lisp/repeat.el (repeat-get-map-sym): New function
refactored from 'repeat-get-map'.
(repeat-get-map): Move continue-related code to 'repeat-get-map-sym'.
(repeat-pre-hook): Use 'repeat-get-map-sym' and 'repeat-get-map'.
Set 'repeat-map' to 'map-sym'.
(repeat-post-hook): Use 'repeat-get-map-sym'.

* test/lisp/repeat-tests.el (repeat-tests-continue-another):
Improve to invoke double key 'C-M-o C-M-o' that should not switch
between maps (bug#74140).
This commit is contained in:
Juri Linkov 2025-01-14 21:41:48 +02:00
parent 6b71d0b178
commit 0bd12f560b
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lisp/repeat.el
View file

@ -453,21 +453,25 @@ See `describe-repeat-maps' for a list of all repeatable commands."
(and (symbolp real-this-command)
(get real-this-command property))))
(defun repeat-get-map (&optional rep-map)
"Return a transient map for keys repeatable after the current command."
(defun repeat-get-map-sym ()
"Return a transient map possibly as a symbol."
(when repeat-mode
(let ((rep-map (or rep-map repeat-map (repeat--command-property 'repeat-map)))
(let ((map-sym (or repeat-map (repeat--command-property 'repeat-map)))
(continue (repeat--command-property 'repeat-continue)))
(when continue
(if repeat-in-progress
(when (and (consp continue)
(memq repeat-in-progress continue))
(setq rep-map repeat-in-progress))
(setq rep-map nil)))
(when rep-map
(when (and (symbolp rep-map) (boundp rep-map))
(setq rep-map (symbol-value rep-map)))
rep-map))))
(setq map-sym repeat-in-progress))
(setq map-sym nil)))
map-sym)))
(defun repeat-get-map (map)
"Return a transient map for keys repeatable after the current command."
(when map
(when (and (symbolp map) (boundp map))
(setq map (symbol-value map)))
map))
(defun repeat-check-key (key map)
"Check if the last KEY is suitable for activating the repeating MAP."
@ -496,20 +500,21 @@ See `describe-repeat-maps' for a list of all repeatable commands."
"Function run before commands to handle repeatable keys."
(when (and repeat-mode repeat-keep-prefix repeat-in-progress
(not prefix-arg) current-prefix-arg)
(let ((map (repeat-get-map)))
(let* ((map-sym (repeat-get-map-sym))
(map (repeat-get-map map-sym)))
;; Only when repeat-post-hook will activate the same map
(when (repeat-check-map map)
;; Optimize to use less logic in the function `repeat-get-map'
;; for the next call: when called again from `repeat-post-hook'
;; it will use the variable `repeat-map'.
(setq repeat-map map)
(setq repeat-map map-sym)
;; Preserve universal argument
(setq prefix-arg current-prefix-arg)))))
(defun repeat-post-hook ()
"Function run after commands to set transient keymap for repeatable keys."
(let* ((was-in-progress repeat-in-progress)
(map-sym (or repeat-map (repeat--command-property 'repeat-map)))
(map-sym (repeat-get-map-sym))
(map (repeat-get-map map-sym)))
(setq repeat-in-progress nil)
(when (repeat-check-map map)

7
test/lisp/repeat-tests.el
View file

@ -233,8 +233,11 @@
'((1 u)) "tz")
;; 'C-M-o' shared with another map should continue current map
(repeat-tests--check
"C-M-s t C-M-o t C-M-o t z"
'((1 s) (1 t) (1 o) (1 t) (1 o) (1 t)) "z"))))
"C-M-s t C-M-o C-M-o t z"
'((1 s) (1 t) (1 o) (1 o) (1 t)) "z")
(repeat-tests--check
"C-M-a c C-M-o C-M-o c z"
'((1 a) (1 c) (1 o) (1 o) (1 c)) "z"))))
(require 'use-package)