From: Alan Mackenzie Date: Fri, 8 Jan 2016 14:41:58 +0000 (+0000) Subject: Respect fontification region calculated by major mode. Fixes bug #22316. X-Git-Tag: emacs-25.0.90~235 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8be046f453b3f74eaf41154f28b85d45d2cc3844;p=emacs.git Respect fontification region calculated by major mode. Fixes bug #22316. * lisp/font-lock.el (font-lock-extend-jit-lock-region-after-change): when a fontification region has been calculated by a function on font-lock-extend-after-change-region-function use this region rather than changing the end position to somewhere else. --- diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 4a92069b12e..3c1f01d5886 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1302,15 +1302,18 @@ This function does 2 things: (point-min)))) (when (< end (point-max)) (setq end - (if (get-text-property end 'font-lock-multiline) - (or (text-property-any end (point-max) - 'font-lock-multiline nil) - (point-max)) + (cond + ((get-text-property end 'font-lock-multiline) + (or (text-property-any end (point-max) + 'font-lock-multiline nil) + (point-max))) + ;; If `end' has been set by the function above, don't corrupt it. + (font-lock-extend-after-change-region-function end) ;; Rounding up to a whole number of lines should include the ;; line right after `end'. Typical case: the first char of ;; the line was deleted. Or a \n was inserted in the middle ;; of a line. - (1+ end)))) + (t (1+ end))))) ;; Finally, pre-enlarge the region to a whole number of lines, to try ;; and anticipate what font-lock-default-fontify-region will do, so as to ;; avoid double-redisplay.