[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 77b72f77b3: Make `font-lock-add-keywords' work in derived modes
From: |
Lars Ingebrigtsen |
Subject: |
master 77b72f77b3: Make `font-lock-add-keywords' work in derived modes |
Date: |
Mon, 24 Jan 2022 05:56:44 -0500 (EST) |
branch: master
commit 77b72f77b3a5d13fc6e71746dee2cf68305057e2
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Make `font-lock-add-keywords' work in derived modes
* lisp/font-lock.el (font-lock-set-defaults): Make
`font-lock-add-keywords' work in derived modes (bug#24176).
---
lisp/font-lock.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 083bfb8626..d8a1fe399b 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1906,8 +1906,9 @@ preserve `hi-lock-mode' highlighting patterns."
Sets various variables using `font-lock-defaults' and
`font-lock-maximum-decoration'."
;; Set fontification defaults if not previously set for correct major mode.
- (unless (and font-lock-set-defaults
- (eq font-lock-major-mode major-mode))
+ (when (or (not font-lock-set-defaults)
+ (not font-lock-major-mode)
+ (not (derived-mode-p font-lock-major-mode)))
(setq font-lock-major-mode major-mode)
(setq font-lock-set-defaults t)
(let* ((defaults font-lock-defaults)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 77b72f77b3: Make `font-lock-add-keywords' work in derived modes,
Lars Ingebrigtsen <=