# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1129916514 0
# Node ID 66e915f36067856516e64dca99ae23a6fcbf9972
# Parent  a5acfefeb8be863342577682b1b10966d9bbc3ac
(font-lock-default-fontify-region): Check the multiline
property independently from the font-lock-multiline variable.

diff -r a5acfefeb8be -r 66e915f36067 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Oct 21 17:25:58 2005 +0000
+++ b/lisp/ChangeLog	Fri Oct 21 17:41:54 2005 +0000
@@ -1,3 +1,8 @@
+2005-10-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* font-lock.el (font-lock-default-fontify-region): Check the multiline
+	property independently from the font-lock-multiline variable.
+
 2005-10-21  Richard M. Stallman  <rms@gnu.org>
 
 	* emacs-lisp/find-func.el (find-library-name): Doc fix.
diff -r a5acfefeb8be -r 66e915f36067 lisp/font-lock.el
--- a/lisp/font-lock.el	Fri Oct 21 17:25:58 2005 +0000
+++ b/lisp/font-lock.el	Fri Oct 21 17:41:54 2005 +0000
@@ -1048,8 +1048,7 @@
           (setq beg (line-beginning-position (- 1 font-lock-lines-before)))
 	  ;; check to see if we should expand the beg/end area for
 	  ;; proper multiline matches
-	  (when (and font-lock-multiline
-		     (> beg (point-min))
+	  (when (and (> beg (point-min))
 		     (get-text-property (1- beg) 'font-lock-multiline))
 	    ;; We are just after or in a multiline match.
 	    (setq beg (or (previous-single-property-change
@@ -1057,10 +1056,9 @@
 			  (point-min)))
 	    (goto-char beg)
 	    (setq beg (line-beginning-position)))
-	  (when font-lock-multiline
-	    (setq end (or (text-property-any end (point-max)
-					     'font-lock-multiline nil)
-			  (point-max))))
+          (setq end (or (text-property-any end (point-max)
+                                           'font-lock-multiline nil)
+                        (point-max)))
 	  (goto-char end)
 	  ;; Round up to a whole line.
           (unless (bolp) (setq end (line-beginning-position 2)))