From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 19 Jan 2001 13:36:03 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.96~201
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2be6ecc60ec712d524f793c936b9be07530a3181;p=emacs.git

*** empty log message ***
---

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.