From df22166e1647234403f2363a764840001193dd0f Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 17 May 2001 13:29:44 +0000 Subject: [PATCH] (jit-lock-after-change): Check the font-lock-multiline text-property after moving to the beginning of line and regardless of the value of font-lock-multiline. --- lisp/ChangeLog | 16 +++++++++++----- lisp/jit-lock.el | 15 +++++++-------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cc5e9071802..b28f19da1c5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2001-05-17 Stefan Monnier + + * jit-lock.el (jit-lock-after-change): Check the font-lock-multiline + text-property after moving to the beginning of line and regardless + of the value of font-lock-multiline. + 2001-05-17 Gerd Moellmann * startup.el (fancy-splash-screens): Ignore events on the mode-line. @@ -27,8 +33,8 @@ of `c'. * textmodes/outline.el (outline-font-lock-level): Remove the - condition-case, test what outline-level returns instead, to ease - debugging. + condition-case, test what outline-level returns instead, to + ease debugging. * international/mule.el (auto-coding-regexp-alist): New user-option. (auto-coding-from-file-contents): New function. @@ -38,9 +44,9 @@ * mouse.el (mouse-delete-other-windows): Doc fix. - * emacs-lisp/lisp-mode.el (lisp-mode): Make - font-lock-keywords-case-fold-search a buffer-local variable - with make-local-variable before setting it. + * emacs-lisp/lisp-mode.el (lisp-mode): + Make font-lock-keywords-case-fold-search a buffer-local variable with + make-local-variable before setting it. 2001-05-14 Eli Zaretskii diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el index 6b142997f5c..d406189f684 100644 --- a/lisp/jit-lock.el +++ b/lisp/jit-lock.el @@ -426,14 +426,6 @@ will take place when text is fontified stealthily." (when jit-lock-mode (save-excursion (with-buffer-prepared-for-jit-lock - ;; If we're in text that matches a multi-line font-lock pattern, - ;; make sure the whole text will be redisplayed. - (when (and font-lock-multiline - (get-text-property start 'font-lock-multiline)) - (setq start (or (previous-single-property-change - start 'font-lock-multiline) - (point-min)))) - ;; It's important that the `fontified' property be set from the ;; beginning of the line, else font-lock will properly change the ;; text's face, but the display will have been done already and will @@ -441,6 +433,13 @@ will take place when text is fontified stealthily." (goto-char start) (setq start (line-beginning-position)) + ;; If we're in text that matches a multi-line font-lock pattern, + ;; make sure the whole text will be redisplayed. + (when (get-text-property start 'font-lock-multiline) + (setq start (or (previous-single-property-change + start 'font-lock-multiline) + (point-min)))) + ;; Make sure we change at least one char (in case of deletions). (setq end (min (max end (1+ start)) (point-max))) ;; Request refontification. -- 2.39.5