From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 19 Jan 2001 13:51:25 +0000 (+0000)
Subject: (font-lock-default-fontify-region): Fix last
X-Git-Tag: emacs-pretest-21.0.96~199
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=111c181ec1a0b8bd37a024e5c0d29144810dca22;p=emacs.git

(font-lock-default-fontify-region): Fix last
change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5595103bbb..35326df71f5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2001-01-19  Gerd Moellmann  <gerd@gnu.org>
 
+	* font-lock.el (font-lock-default-fontify-region): Fix last
+	change.
+	
 	* 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'.
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 5316b110995..188b5de7fe8 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1212,10 +1212,10 @@ The value of this variable is used when Font Lock mode is turned on."
 			  (point-min)))
 	    (goto-char beg)
 	    (setq beg (line-beginning-position)))
-	  (setq end (or (and font-lock-multiline
-			     (text-property-any end (point-max)
-						'font-lock-multiline nil))
-			(point-max)))
+	  (when font-lock-multiline
+	    (setq end (or (text-property-any end (point-max)
+					     'font-lock-multiline nil)
+			  (point-max))))
 	  (goto-char end)
 	  (setq end (line-beginning-position 2))
 	  ;; Now do the fontification.