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

avy.el (avy-process): Restart on fail for avy-style 'words

Browse Source 
Fixes #283
This commit is contained in:
Federico Tedin 2019-09-05 00:37:21 +02:00 committed by Oleh Krehel
parent 034de4c0e9
commit 5127f993f9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
avy.el
View File

@ -451,7 +451,8 @@ KEYS is the path from the root of `avy-tree' to LEAF."
"The default handler for a bad CHAR." "The default handler for a bad CHAR."
(let (dispatch) (let (dispatch)
(cond ((setq dispatch (assoc char avy-dispatch-alist)) (cond ((setq dispatch (assoc char avy-dispatch-alist))
(setq avy-action (cdr dispatch)) (unless (eq avy-style 'words)
(setq avy-action (cdr dispatch)))
(throw 'done 'restart)) (throw 'done 'restart))
((memq char '(?\e ?\C-g)) ((memq char '(?\e ?\C-g))
;; exit silently ;; exit silently
@ -862,8 +863,10 @@ multiple OVERLAY-FN invocations."
(res (avy--process-1 candidates overlay-fn cleanup-fn))) (res (avy--process-1 candidates overlay-fn cleanup-fn)))
(cond (cond
((null res) ((null res)
(if (eq avy-style 'words)
(avy-process original-cands overlay-fn cleanup-fn)
(message "zero candidates") (message "zero candidates")
t) t))
((eq res 'restart) ((eq res 'restart)
(avy-process original-cands overlay-fn cleanup-fn)) (avy-process original-cands overlay-fn cleanup-fn))
;; ignore exit from `avy-handler-function' ;; ignore exit from `avy-handler-function'