ld/avy
1
0
Fork 0
mirror of https://github.com/abo-abo/avy.git synced 2025-10-13 13:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

avy.el (avy-read): Don't call `avy--key-to-char' too early

Browse Source 
If the key is intended for dispatch, it's not necessary for
`avy--key-to-char' to encode it as a char.
This commit is contained in:
Oleh Krehel 2019-06-30 17:38:41 +02:00
parent 343fc42de1
commit 66886e265c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
avy.el
View File

@ -518,13 +518,14 @@ multiple DISPLAY-FN invocations."
(funcall cleanup-fn) (funcall cleanup-fn)
(if (setq window (avy-mouse-event-window char)) (if (setq window (avy-mouse-event-window char))
(throw 'done (cons char window)) (throw 'done (cons char window))
(if (setq branch (assoc char tree))
(progn
;; Ensure avy-current-path stores the full path prior to ;; Ensure avy-current-path stores the full path prior to
;; exit so other packages can utilize its value. ;; exit so other packages can utilize its value.
(setq avy-current-path (setq avy-current-path
(concat avy-current-path (string (avy--key-to-char char)))) (concat avy-current-path (string (avy--key-to-char char))))
(if (setq branch (assoc char tree))
(if (eq (car (setq tree (cdr branch))) 'leaf) (if (eq (car (setq tree (cdr branch))) 'leaf)
(throw 'done (cdr tree))) (throw 'done (cdr tree))))
(funcall avy-handler-function char))))))) (funcall avy-handler-function char)))))))
(defun avy-read-de-bruijn (lst keys) (defun avy-read-de-bruijn (lst keys)