[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 cfa2a94: Change font-lock-extend-region-multiline
From: |
Tom Tromey |
Subject: |
[Emacs-diffs] emacs-26 cfa2a94: Change font-lock-extend-region-multiline handling in mhtml-mode |
Date: |
Sat, 25 Nov 2017 15:48:08 -0500 (EST) |
branch: emacs-26
commit cfa2a944d4cf62f16c177398226b17aad88bb5c6
Author: Tom Tromey <address@hidden>
Commit: Tom Tromey <address@hidden>
Change font-lock-extend-region-multiline handling in mhtml-mode
Bug#29159
* lisp/textmodes/mhtml-mode.el (mhtml-mode): Remove
font-lock-extend-region-multiline from
font-lock-extend-region-functions.
(mhtml--extend-font-lock-region): Call font-lock-extend-region-multiline.
---
lisp/textmodes/mhtml-mode.el | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lisp/textmodes/mhtml-mode.el b/lisp/textmodes/mhtml-mode.el
index 8df2512..09da155 100644
--- a/lisp/textmodes/mhtml-mode.el
+++ b/lisp/textmodes/mhtml-mode.el
@@ -198,6 +198,12 @@ smallest."
(get-text-property orig-end 'mhtml-submode))
(cl-decf font-lock-end)))
+ ;; Also handle the multiline property -- but handle it here, and
+ ;; not via font-lock-extend-region-functions, to avoid the
+ ;; situation where the two extension functions disagree.
+ ;; See bug#29159.
+ (font-lock-extend-region-multiline)
+
(or (/= font-lock-beg orig-beg)
(/= font-lock-end orig-end))))
@@ -365,8 +371,7 @@ the rules from `css-mode'."
(setq-local font-lock-fontify-region-function
#'mhtml--submode-fontify-region)
(setq-local font-lock-extend-region-functions
- '(mhtml--extend-font-lock-region
- font-lock-extend-region-multiline))
+ '(mhtml--extend-font-lock-region))
;; Attach this to both pre- and post- hooks just in case it ever
;; changes a key binding that might be accessed from the menu bar.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 cfa2a94: Change font-lock-extend-region-multiline handling in mhtml-mode,
Tom Tromey <=