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

Fixes #277

avy.el

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