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

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

[elpa] master d4b693f 52/78: avy.el (avy--overlay): Take BEG END, instea


From: Oleh Krehel
Subject: [elpa] master d4b693f 52/78: avy.el (avy--overlay): Take BEG END, instead of only BEG
Date: Sat, 23 Jan 2016 14:00:11 +0000

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

    avy.el (avy--overlay): Take BEG END, instead of only BEG
    
    * avy.el (avy--overlay):
    (avy--overlay-pre):
    (avy--overlay-at):
    (avy--overlay-post): Update.
    Previously, END was implied to be (1+ BEG).
---
 avy.el |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/avy.el b/avy.el
index ac862d9..9e05c9f 100644
--- a/avy.el
+++ b/avy.el
@@ -621,13 +621,13 @@ When GROUP is non-nil, (BEG . END) should delimit that 
regex group."
         (propertize old-str 'face 'avy-background-face)
       old-str)))
 
-(defun avy--overlay (str pt wnd &optional compose-fn)
-  "Create an overlay with STR at PT in WND.
-COMPOSE-FN is a lambda that concatenates the old string at PT with STR."
-  (when (<= (1+ pt) (with-selected-window wnd (point-max)))
-    (let* ((pt (+ pt avy--overlay-offset))
-           (ol (make-overlay pt (1+ pt) (window-buffer wnd)))
-           (old-str (avy--old-str pt wnd))
+(defun avy--overlay (str beg end wnd &optional compose-fn)
+  "Create an overlay with STR from BEG to END in WND.
+COMPOSE-FN is a lambda that concatenates the old string at BEG with STR."
+  (when (<= (1+ beg) (with-selected-window wnd (point-max)))
+    (let* ((beg (+ beg avy--overlay-offset))
+           (ol (make-overlay beg (or end (1+ beg)) (window-buffer wnd)))
+           (old-str (avy--old-str beg wnd))
            (os-line-prefix (get-text-property 0 'line-prefix old-str))
            (os-wrap-prefix (get-text-property 0 'wrap-prefix old-str)))
       (when os-line-prefix
@@ -691,7 +691,7 @@ LEAF is normally ((BEG . END) . WND)."
                str))
     (avy--overlay
      str
-     (avy-candidate-beg leaf)
+     (avy-candidate-beg leaf) nil
      (avy-candidate-wnd leaf))))
 
 (defun avy--overlay-at (path leaf)
@@ -704,7 +704,7 @@ LEAF is normally ((BEG . END) . WND)."
                'face 'avy-lead-face)))
     (avy--overlay
      str
-     (avy-candidate-beg leaf)
+     (avy-candidate-beg leaf) nil
      (avy-candidate-wnd leaf)
      (lambda (str old-str)
        (cond ((string= old-str "\n")
@@ -782,7 +782,7 @@ LEAF is normally ((BEG . END) . WND)."
                str))
     (avy--overlay
      str
-     (avy-candidate-end leaf)
+     (avy-candidate-end leaf) nil
      (avy-candidate-wnd leaf))))
 
 (defun avy--update-offset-and-str (offset str)



reply via email to

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