[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 1bed252: Preserve the face foreground in Info-fontify-node
From: |
Lars Ingebrigtsen |
Subject: |
master 1bed252: Preserve the face foreground in Info-fontify-node |
Date: |
Thu, 13 Aug 2020 07:35:39 -0400 (EDT) |
branch: master
commit 1bed252ae9109493133a0cc3e9aad9e9a5ddde37
Author: Juri Linkov <juri@jurta.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
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).
---
lisp/info.el | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lisp/info.el b/lisp/info.el
index 78f8894..c8318a3 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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 1bed252: Preserve the face foreground in Info-fontify-node,
Lars Ingebrigtsen <=