*** empty log message ***

2 files changed, 6 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 3501994e8a6..5bad5a96bf0 100644
--- 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 0122867cd19..b5595103bbb 100644
--- 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.