(jit-lock-after-change): If font-lock-multiline

is nil, don't check the `font-lock-multiline' text property.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c33ceb0c7ea833e502ff2d51ffad36ed92f8fb5d..0122867cd19d7b037f4b9c885dbbd0ee789fa5a5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-19  Gerd Moellmann  <gerd@gnu.org>
+
+       * jit-lock.el (jit-lock-after-change): If font-lock-multiline
+       is nil, don't check the `font-lock-multiline' text property.
+
 2001-01-19  Michael Kifer  <kifer@cs.sunysb.edu>
 
        * viper.el: Call initial-major-mode on startup.

diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 9cd9d2929ec3c6ce72851a6c2d9e5d6ce894113e..5fa93f0b94a0a63ba7a2c02c90beef19ea5f1682 100644 (file)
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -422,7 +422,8 @@ will take place when text is fontified stealthily."
       (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 (get-text-property start 'font-lock-multiline)
+       (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))))