]> git.eshelyaron.com Git - emacs.git/commitdiff
Revert "Preserve the face foreground in Info-fontify-node"
authorLars Ingebrigtsen <larsi@gnus.org>
Fri, 14 Aug 2020 09:49:05 +0000 (11:49 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Fri, 14 Aug 2020 09:49:42 +0000 (11:49 +0200)
This reverts commit 1bed252ae9109493133a0cc3e9aad9e9a5ddde37.

Juri Linkov says:

This patch breaks Info fontification, please revert it.
Here is what I said in the message sent later with another patch at
https://debbugs.gnu.org/14645#14

  Using the text property `face' instead of `font-lock-face'
  might break something, so a better patch below removes
  the text properties `face info-index-match' from the Info buffer

lisp/info.el

index c8318a3967ff14948c9cc417eec73f772fbedf81..78f88947c79d32660eb5783c388b156986fd2860 100644 (file)
@@ -4971,8 +4971,9 @@ 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)
-               (add-face-text-property
+               (put-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
@@ -5001,9 +5002,7 @@ 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)
-                 'append))
+                              res))) 'info-xref-visited 'info-xref)))
              (when (and not-fontified-p
                         (memq Info-hide-note-references '(t hide))
                         (not (Info-index-node)))