From: Alan Mackenzie <acm@muc.de>
Date: Fri, 20 Mar 2015 15:39:37 +0000 (+0000)
Subject: Fix debbugs#20146
X-Git-Tag: emacs-25.0.90~2564^2~118
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=932d0fdb4fb217adb4e894b595c2294abc4fef3e;p=emacs.git

Fix debbugs#20146

* font-lock.el (font-lock-extend-jit-lock-region-after-change):
Return the calculated values, as per spec.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac99cd5ec39..cecec469ed8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-20  Alan Mackenzie  <acm@muc.de>
+
+	Fix debbugs#20146
+
+	* font-lock.el (font-lock-extend-jit-lock-region-after-change):
+	Return the calculated values, as per spec.
+
 2015-03-20  Dmitry Gutov  <dgutov@yandex.ru>
 
 	* progmodes/ruby-mode.el (ruby-font-lock-keywords): Move `at_exit'
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 6ec6c9f1196..1838a0f02b4 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1325,11 +1325,13 @@ This function does 2 things:
       (when (memq 'font-lock-extend-region-wholelines
                   font-lock-extend-region-functions)
         (goto-char beg)
-        (setq jit-lock-start (min jit-lock-start (line-beginning-position)))
+        (setq beg (min jit-lock-start (line-beginning-position)))
         (goto-char end)
-        (setq jit-lock-end
+        (setq end
               (max jit-lock-end
-                   (if (bolp) (point) (line-beginning-position 2))))))))
+                   (if (bolp) (point) (line-beginning-position 2)))))
+      (setq jit-lock-start beg
+	    jit-lock-end end))))
 
 (defun font-lock-fontify-block (&optional arg)
   "Fontify some lines the way `font-lock-fontify-buffer' would.