From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 19 Sep 2005 12:08:07 +0000 (+0000)
Subject: (font-lock-default-fontify-region): Don't unconditionally add a line, since
X-Git-Tag: emacs-pretest-22.0.90~7013
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5d4247d31a0e3377afeb20b878c6cb90bb695e53;p=emacs.git

(font-lock-default-fontify-region): Don't unconditionally add a line, since
the after-change-function already did it.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ebb686e28e..e2ef572c6c2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* font-lock.el (font-lock-default-fontify-region):
+	Don't unconditionally add a line, since the after-change-function
+	already did it.
+
 2005-09-19  Miles Bader  <miles@gnu.org>
 
 	* net/newsticker.el: Get rid of CVS keyword.
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 99dd61bacb2..c4228c2841d 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1061,7 +1061,8 @@ a very meaningful entity to highlight.")
 					     'font-lock-multiline nil)
 			  (point-max))))
 	  (goto-char end)
-	  (setq end (line-beginning-position 2))
+	  ;; Round up to a whole line.
+          (unless (bolp) (setq end (line-beginning-position 2)))
 	  ;; Now do the fontification.
 	  (font-lock-unfontify-region beg end)
 	  (when font-lock-syntactic-keywords
@@ -1073,12 +1074,12 @@ a very meaningful entity to highlight.")
       (set-syntax-table old-syntax-table))))
 
 ;; The following must be rethought, since keywords can override fontification.
-;      ;; Now scan for keywords, but not if we are inside a comment now.
-;      (or (and (not font-lock-keywords-only)
-;	       (let ((state (parse-partial-sexp beg end nil nil
-;						font-lock-cache-state)))
-;		 (or (nth 4 state) (nth 7 state))))
-;	  (font-lock-fontify-keywords-region beg end))
+;;    ;; Now scan for keywords, but not if we are inside a comment now.
+;;    (or (and (not font-lock-keywords-only)
+;;             (let ((state (parse-partial-sexp beg end nil nil
+;;                                              font-lock-cache-state)))
+;;               (or (nth 4 state) (nth 7 state))))
+;;        (font-lock-fontify-keywords-region beg end))
 
 (defvar font-lock-extra-managed-props nil
   "Additional text properties managed by font-lock.