[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 9d18bf9 70/78: avy.el (avy--overlay): Fix overlays at poin
From: |
Oleh Krehel |
Subject: |
[elpa] master 9d18bf9 70/78: avy.el (avy--overlay): Fix overlays at point-max |
Date: |
Sat, 23 Jan 2016 14:00:24 +0000 |
branch: master
commit 9d18bf9fc247e7423b954d05cecdea2417dfc239
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
avy.el (avy--overlay): Fix overlays at point-max
* avy.el (avy--overlay): When an overlay is requested at `point-max',
use 'after-string overlay property instead of 'display.
Fixes #125
---
avy.el | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/avy.el b/avy.el
index 8d7e31f..6d7a139 100644
--- a/avy.el
+++ b/avy.el
@@ -634,22 +634,26 @@ When GROUP is non-nil, (BEG . END) should delimit that
regex group."
(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
- (add-text-properties 0 1 `(line-prefix ,os-line-prefix) str))
- (when os-wrap-prefix
- (add-text-properties 0 1 `(wrap-prefix ,os-wrap-prefix) str))
- (overlay-put ol 'window wnd)
- (overlay-put ol 'category 'avy)
- (overlay-put ol 'display (funcall
- (or compose-fn #'concat)
- str old-str))
- (push ol avy--overlays-lead))))
+ (let ((eob (with-selected-window wnd (point-max))))
+ (when (<= beg eob)
+ (let* ((beg (+ beg avy--overlay-offset))
+ (ol (make-overlay beg (or end (1+ beg)) (window-buffer wnd)))
+ (old-str (if (eq beg eob) "" (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
+ (add-text-properties 0 1 `(line-prefix ,os-line-prefix) str))
+ (when os-wrap-prefix
+ (add-text-properties 0 1 `(wrap-prefix ,os-wrap-prefix) str))
+ (overlay-put ol 'window wnd)
+ (overlay-put ol 'category 'avy)
+ (overlay-put ol (if (eq beg eob)
+ 'after-string
+ 'display)
+ (funcall
+ (or compose-fn #'concat)
+ str old-str))
+ (push ol avy--overlays-lead)))))
(defcustom avy-highlight-first nil
"When non-nil highlight the first decision char with `avy-lead-face-0'.
- [elpa] master a041429 62/78: avy.el (avy-copy-region): Obey avy-line-insert-style, (continued)
- [elpa] master a041429 62/78: avy.el (avy-copy-region): Obey avy-line-insert-style, Oleh Krehel, 2016/01/23
- [elpa] master 54074c7 65/78: avy.el (avy-all-windows-alt): New defcustom, Oleh Krehel, 2016/01/23
- [elpa] master 54fb4d6 61/78: avy.el (avy-line-insert-style): Customize avy-copy-line, avy-move-line, Oleh Krehel, 2016/01/23
- [elpa] master 4a23a0d 60/78: Fix De Bruijn "No catch for tag" error, Oleh Krehel, 2016/01/23
- [elpa] master 4132dd6 63/78: avy.el (avy-goto-line-above): Work in a single window, Oleh Krehel, 2016/01/23
- [elpa] master a45159a 64/78: avy.el (avy-goto-line-above): Exclude the current line, Oleh Krehel, 2016/01/23
- [elpa] master fa6d1e1 66/78: avy.el (avy-copy-region): Fix for multi-buffer use, Oleh Krehel, 2016/01/23
- [elpa] master b1a1953 67/78: Customize extra chars for avy-goto-subword-1, Oleh Krehel, 2016/01/23
- [elpa] master bae6fb1 71/78: avy.el (avy-copy-region): Keep same selectors for the second pass, Oleh Krehel, 2016/01/23
- [elpa] master 72ecbfa 68/78: avy.el (avy-goto-line): fix for narrowed regions, Oleh Krehel, 2016/01/23
- [elpa] master 9d18bf9 70/78: avy.el (avy--overlay): Fix overlays at point-max,
Oleh Krehel <=
- [elpa] master 47035cf 69/78: avy.el (avy--line): Don't modify avy-action, Oleh Krehel, 2016/01/23
- [elpa] master 808bb80 72/78: avy.el (avy--regex-candidates): Modify case-fold-search condition, Oleh Krehel, 2016/01/23
- [elpa] master 212a132 74/78: Don't shorten selector string for visual-line-mode and bolp, Oleh Krehel, 2016/01/23
- [elpa] master dd80749 73/78: Add case fold search to avy-goto-char-timer, Oleh Krehel, 2016/01/23
- [elpa] master 15d0679 75/78: copy/move line to an initial window, Oleh Krehel, 2016/01/23
- [elpa] master 369af59 76/78: avy.el (avy--overlay): Fix interaction with goto-address-mode, Oleh Krehel, 2016/01/23
- [elpa] master 11fbd70 77/78: Bump version, Oleh Krehel, 2016/01/23
- [elpa] master a6b7502 78/78: Merge commit '11fbd70347a8cc62817c6d4ebf2291471ebdd607' from avy, Oleh Krehel, 2016/01/23