ld/avy
1
0
Fork 0
mirror of https://github.com/abo-abo/avy.git synced 2025-10-13 21:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

avy.el (avy--overlay): Fix overlays at point-max

Browse Source 
* avy.el (avy--overlay): When an overlay is requested at `point-max',
  use 'after-string overlay property instead of 'display.

Fixes #125
This commit is contained in:
Oleh Krehel 2015-12-22 11:45:44 +01:00
parent 47035cf4ea
commit 9d18bf9fc2
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
avy.el
View File

@ -634,10 +634,11 @@ When GROUP is non-nil, (BEG . END) should delimit that regex group."
(defun avy--overlay (str beg end wnd &optional compose-fn) (defun avy--overlay (str beg end wnd &optional compose-fn)
"Create an overlay with STR from BEG to END in WND. "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." COMPOSE-FN is a lambda that concatenates the old string at BEG with STR."
(when (<= (1+ beg) (with-selected-window wnd (point-max))) (let ((eob (with-selected-window wnd (point-max))))
(when (<= beg eob)
(let* ((beg (+ beg avy--overlay-offset)) (let* ((beg (+ beg avy--overlay-offset))
(ol (make-overlay beg (or end (1+ beg)) (window-buffer wnd))) (ol (make-overlay beg (or end (1+ beg)) (window-buffer wnd)))
(old-str (avy--old-str beg wnd)) (old-str (if (eq beg eob) "" (avy--old-str beg wnd)))
(os-line-prefix (get-text-property 0 'line-prefix old-str)) (os-line-prefix (get-text-property 0 'line-prefix old-str))
(os-wrap-prefix (get-text-property 0 'wrap-prefix old-str))) (os-wrap-prefix (get-text-property 0 'wrap-prefix old-str)))
(when os-line-prefix (when os-line-prefix
@ -646,10 +647,13 @@ COMPOSE-FN is a lambda that concatenates the old string at BEG with STR."
(add-text-properties 0 1 `(wrap-prefix ,os-wrap-prefix) str)) (add-text-properties 0 1 `(wrap-prefix ,os-wrap-prefix) str))
(overlay-put ol 'window wnd) (overlay-put ol 'window wnd)
(overlay-put ol 'category 'avy) (overlay-put ol 'category 'avy)
(overlay-put ol 'display (funcall (overlay-put ol (if (eq beg eob)
'after-string
'display)
(funcall
(or compose-fn #'concat) (or compose-fn #'concat)
str old-str)) str old-str))
(push ol avy--overlays-lead)))) (push ol avy--overlays-lead)))))
(defcustom avy-highlight-first nil (defcustom avy-highlight-first nil
"When non-nil highlight the first decision char with `avy-lead-face-0'. "When non-nil highlight the first decision char with `avy-lead-face-0'.