emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master e35f1ed 19/36: Use `avy-lead-face-0' for 'pre and 'post


From: Oleh Krehel
Subject: [elpa] master e35f1ed 19/36: Use `avy-lead-face-0' for 'pre and 'post
Date: Tue, 19 May 2015 12:38:14 +0000

branch: master
commit e35f1ed51f56601938aeb0fd343798661fecfaf4
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    Use `avy-lead-face-0' for 'pre and 'post
    
    * avy.el (avy--overlay-pre): Update.
    (avy--overlay-post): Update.
    
    Re #38
---
 avy.el |   54 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/avy.el b/avy.el
index 229ce81..84a2c34 100644
--- a/avy.el
+++ b/avy.el
@@ -368,18 +368,21 @@ When GROUP is non-nil, (BEG . END) should delimit that 
regex group."
   "Create an overlay with PATH at LEAF.
 PATH is a list of keys from tree root to LEAF.
 LEAF is normally ((BEG . END) . WND)."
-  (avy--overlay
-   (propertize (apply #'string (reverse path))
-               'face 'avy-lead-face)
-   (cond ((numberp leaf)
-          leaf)
-         ((consp (car leaf))
-          (caar leaf))
-         (t
-          (car leaf)))
-   (if (consp leaf)
-       (cdr leaf)
-     (selected-window))))
+  (let ((str (propertize (apply #'string (reverse path))
+                         'face 'avy-lead-face)))
+    (when (> (length str) 1)
+      (set-text-properties 0 1 '(face avy-lead-face-0) str))
+    (avy--overlay
+     str
+     (cond ((numberp leaf)
+            leaf)
+           ((consp (car leaf))
+            (caar leaf))
+           (t
+            (car leaf)))
+     (if (consp leaf)
+         (cdr leaf)
+       (selected-window)))))
 
 (defun avy--overlay-at (path leaf)
   "Create an overlay with PATH at LEAF.
@@ -449,18 +452,21 @@ LEAF is normally ((BEG . END) . WND)."
   "Create an overlay with PATH at LEAF.
 PATH is a list of keys from tree root to LEAF.
 LEAF is normally ((BEG . END) . WND)."
-  (avy--overlay
-   (propertize (apply #'string (reverse path))
-               'face 'avy-lead-face)
-   (cond ((numberp leaf)
-          leaf)
-         ((consp (car leaf))
-          (cdar leaf))
-         (t
-          (car leaf)))
-   (if (consp leaf)
-       (cdr leaf)
-     (selected-window))))
+  (let ((str (propertize (apply #'string (reverse path))
+                         'face 'avy-lead-face)))
+    (when (> (length str) 1)
+      (set-text-properties 0 1 '(face avy-lead-face-0) str))
+    (avy--overlay
+     str
+     (cond ((numberp leaf)
+            leaf)
+           ((consp (car leaf))
+            (cdar leaf))
+           (t
+            (car leaf)))
+     (if (consp leaf)
+         (cdr leaf)
+       (selected-window)))))
 
 (defun avy--style-fn (style)
   "Transform STYLE symbol to a style function."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]