summaryrefslogtreecommitdiff
path: root/lisp/info.el
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2020-08-13 13:32:10 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2020-08-13 13:32:10 +0200
commit1bed252ae9109493133a0cc3e9aad9e9a5ddde37 (patch)
treeb0e44243a59f114c97787a069d2ccb84c1a6040a /lisp/info.el
parentc84d3c1638a140b3ca16e8285328a903e16aa27e (diff)
downloademacs-1bed252ae9109493133a0cc3e9aad9e9a5ddde37.tar.gz
Preserve the face foreground in Info-fontify-node
* lisp/info.el (Info-fontify-node): Preserve the face foreground. Previously `Info-index' added the `info-index-match' face to the strings of the found index entries. Later `Info-virtual-index-find-node' inserts strings to the Info buffer. And finally `Info-fontify-node' puts the `font-lock-face' property with `info-xref' on links. The `face info-index-match' takes precedence over `font-lock-face info-xref' (bug#14645).
Diffstat (limited to 'lisp/info.el')
-rw-r--r--lisp/info.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/info.el b/lisp/info.el
index 78f88947c79..c8318a3967f 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -4971,9 +4971,8 @@ first line or header line, and for breadcrumb links.")
"mouse-2: go to this node")
'mouse-face 'highlight)))
(when (or not-fontified-p fontify-visited-p)
- (put-text-property
+ (add-face-text-property
(match-beginning 1) (match-end 1)
- 'font-lock-face
;; Display visited menu items in a different face
(if (and Info-fontify-visited-nodes
(save-match-data
@@ -5002,7 +5001,9 @@ first line or header line, and for breadcrumb links.")
(caar hl))))
(setq res (car hl) hl nil)
(setq hl (cdr hl))))
- res))) 'info-xref-visited 'info-xref)))
+ res)))
+ 'info-xref-visited 'info-xref)
+ 'append))
(when (and not-fontified-p
(memq Info-hide-note-references '(t hide))
(not (Info-index-node)))