avy.el (avy-resume): Work better for avy-goto-timer

Fixes #277
This commit is contained in:
Oleh Krehel
2019-06-25 18:19:31 +02:00
parent f91ae613a8
commit aadca9308a

10
avy.el
View File

@@ -665,7 +665,9 @@ Set `avy-style' according to COMMMAND as well."
(setf (symbol-function 'avy-resume) (setf (symbol-function 'avy-resume)
(lambda () (lambda ()
(interactive) (interactive)
,@body)) ,@(if (eq command 'avy-goto-char-timer)
(cdr body)
body)))
,@body)) ,@body))
(defun avy-action-goto (pt) (defun avy-action-goto (pt)
@@ -2061,6 +2063,8 @@ Otherwise, the whole regex is highlighted."
overlays))) overlays)))
(dolist (ov overlays) (dolist (ov overlays)
(delete-overlay ov)) (delete-overlay ov))
(avy--done))))
(defvar avy--old-cands nil) (defvar avy--old-cands nil)
;;;###autoload ;;;###autoload
@@ -2070,8 +2074,8 @@ The window scope is determined by `avy-all-windows' (ARG negates it)."
(interactive "P") (interactive "P")
(let ((avy-all-windows (if arg (let ((avy-all-windows (if arg
(not avy-all-windows) (not avy-all-windows)
avy-all-windows))) avy-all-windows)))
(avy-with avy-goto-char-timer (avy-with avy-goto-char-timer
(setq avy--old-cands (avy--read-candidates)) (setq avy--old-cands (avy--read-candidates))
(avy-process avy--old-cands)))) (avy-process avy--old-cands))))