[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master b61131c 03/17: avy-jump.el (avi--overlay-pre): Handle plai
From: |
Oleh Krehel |
Subject: |
[elpa] master b61131c 03/17: avy-jump.el (avi--overlay-pre): Handle plain numbers |
Date: |
Fri, 08 May 2015 13:43:38 +0000 |
branch: master
commit b61131c3bc4e111b2dc34e8932e924717fbdbbfa
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
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.
---
avy-jump.el | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/avy-jump.el b/avy-jump.el
index e39931d..60f4f25 100644
--- 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
- [elpa] master updated (876d210 -> 269e61a), Oleh Krehel, 2015/05/08
- [elpa] master 7b44c1f 01/17: avy-jump.el (avi-goto-subword-0): New command, Oleh Krehel, 2015/05/08
- [elpa] master b61131c 03/17: avy-jump.el (avi--overlay-pre): Handle plain numbers,
Oleh Krehel <=
- [elpa] master ff4ce51 02/17: Don't collect candidates hidden by outlines, Oleh Krehel, 2015/05/08
- [elpa] master cd6583b 04/17: avy-jump.el (avi-all-windows): New defcustom, Oleh Krehel, 2015/05/08
- [elpa] master f92689a 06/17: avy-jump.el (avi--line): Fixup the issue with org outlines, Oleh Krehel, 2015/05/08
- [elpa] master 17b44a8 05/17: Update a few commands to jump in one or more windows, Oleh Krehel, 2015/05/08
- [elpa] master 3bbd404 08/17: Make sure avi-move-line and avi-copy-line behave consistently., Oleh Krehel, 2015/05/08
- [elpa] master ca92a08 09/17: avy-jump.el (avi-goto-word-1): Count some syms as words, Oleh Krehel, 2015/05/08
- [elpa] master dfe24f3 11/17: Add `avi-word-punc-regexp` defcustom, Oleh Krehel, 2015/05/08
- [elpa] master 6a0acfc 10/17: Add "make compile" and "make run", Oleh Krehel, 2015/05/08
- [elpa] master ee76efd 12/17: Fix rounding error, Oleh Krehel, 2015/05/08
- [elpa] master d1780dd 07/17: avy-jump.el (avi-goto-line): Work with one or more windows, Oleh Krehel, 2015/05/08