diff options
| author | Tom Tromey <tom@tromey.com> | 2017-11-25 12:11:21 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-11-25 13:25:37 -0700 |
| commit | cfa2a944d4cf62f16c177398226b17aad88bb5c6 (patch) | |
| tree | 28c8ea046ad2e2042b175a3fb5dfd49a72d19e04 /lisp/textmodes/mhtml-mode.el | |
| parent | a8664cc9986be3a7d0ff4c46546ea1d9c906ab00 (diff) | |
| download | emacs-cfa2a944d4cf62f16c177398226b17aad88bb5c6.tar.gz | |
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.
Diffstat (limited to 'lisp/textmodes/mhtml-mode.el')
| -rw-r--r-- | lisp/textmodes/mhtml-mode.el | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lisp/textmodes/mhtml-mode.el b/lisp/textmodes/mhtml-mode.el index 8df251276b5..09da155f487 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. |