From 369af594e5ea28be1d91b22753aace16baadc046 Mon Sep 17 00:00:00 2001 From: Oleh Krehel Date: Wed, 20 Jan 2016 09:22:34 +0100 Subject: [PATCH] avy.el (avy--overlay): Fix interaction with goto-address-mode The other overlay has no priority, but sets a face. That face is overridden by the avy overlay (which has priority). Fixes abo-abo/ace-link#24 --- avy.el | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/avy.el b/avy.el index 5205145db..4afc15b8f 100644 --- a/avy.el +++ b/avy.el @@ -1,4 +1,4 @@ -;;; avy.el --- set-based completion -*- lexical-binding: t -*- +;;; avy.el --- tree-based completion -*- lexical-binding: t -*- ;; Copyright (C) 2015 Free Software Foundation, Inc. @@ -640,11 +640,18 @@ COMPOSE-FN is a lambda that concatenates the old string at BEG with STR." (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))) + (os-wrap-prefix (get-text-property 0 'wrap-prefix old-str)) + other-ol) (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)) + (when (setq other-ol (cl-find-if + (lambda (o) (overlay-get o 'goto-address)) + (overlays-at beg))) + (add-text-properties + 0 (length old-str) + `(face ,(overlay-get other-ol 'face)) old-str)) (overlay-put ol 'window wnd) (overlay-put ol 'category 'avy) (overlay-put ol (if (eq beg eob) -- 2.39.2