*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 3501994e8a635ea552f93f70540b1c48e024882a..5bad5a96bf0f00d1cd6f81f0f403c4474e0cabe1 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -958,7 +958,8 @@ Version numbers are only found in the first 10 percent of a file.
 *** The new function `font-lock-remove-keywords' can be used to remove
 font-lock keywords from the current buffer or from a specific major mode.
 
-*** multiline patterns are now supported.
+*** Multiline patterns are now supported.  Modes using this, should
+set font-lock-multiline to t in their font-lock-defaults.
 
 *** `font-lock-syntactic-face-function' allows major-modes to choose
 the face used for each string/comment.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0122867cd19d7b037f4b9c885dbbd0ee789fa5a5..b5595103bbb2a478cfa9be7235cd1317d4888946 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2001-01-19  Gerd Moellmann  <gerd@gnu.org>
 
+       * font-lock.el (font-lock-multiline): Default to nil.
+       (font-lock-default-fontify-region): If font-lock-multiline is
+       nil, don't check the property `font-lock-multiline'.
+
        * jit-lock.el (jit-lock-after-change): If font-lock-multiline
        is nil, don't check the `font-lock-multiline' text property.