avy-jump.el (avi--overlay-pre): Handle plain numbers

* avy-jump.el (avi--overlay-pre): (avi--overlay-post): Handle the case of LEAF being a number.
11 years ago · b61131c3bc
parent ff4ce51242
commit b61131c3bc
1 changed files with 18 additions and 8 deletions
--- a/avy-jump.el
+++ b/avy-jump.el
@ -118,10 +118,15 @@ LEAF is ((BEG . END) . WND)."
  (avi--overlay
   (propertize (apply #'string (reverse path))
               'face 'avi-lead-face)
-   (if (consp (car leaf))
-       (caar leaf)
-     (car leaf))
-   (cdr leaf)))
+   (cond ((numberp leaf)
+          leaf)
+         ((consp (car leaf))
+          (caar leaf))
+         (t
+          (car leaf)))
+   (if (consp leaf)
+       (cdr leaf)
+     (selected-window))))

 (defun avi--overlay-at (path leaf)
  "Create an overlay with STR at LEAF.
@ -152,10 +157,15 @@ LEAF is ((BEG . END) . WND)."
  (avi--overlay
   (propertize (apply #'string (reverse path))
               'face 'avi-lead-face)
-   (if (consp (car leaf))
-       (cdar leaf)
-     (car leaf))
-   (cdr leaf)))
+   (cond ((numberp leaf)
+          leaf)
+         ((consp (car leaf))
+          (cdar leaf))
+         (t
+          (car leaf)))
+   (if (consp leaf)
+       (cdr leaf)
+     (selected-window))))

 ;;* Commands
 ;;;###autoload