From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 25 Jan 2016 14:28:37 +0000 (-0500)
Subject: (font-lock-ensure-function): Fix bug#22399
X-Git-Tag: emacs-25.0.90~53
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=21beb19d80b6aba2c2b736b3e1d031f1ef0e743d;p=emacs.git

(font-lock-ensure-function): Fix bug#22399

* lisp/font-lock.el (font-lock-ensure-function): Fix handling when
font-lock-mode is not enabled (bug#22399).
---

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 3c1f01d5886..6f94f353c90 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1074,7 +1074,13 @@ accessible portion of the current buffer."
 
 (defvar font-lock-ensure-function
   (lambda (_beg _end)
-    (unless font-lock-fontified (font-lock-default-fontify-buffer)))
+    (unless font-lock-fontified
+      (font-lock-default-fontify-buffer)
+      (unless font-lock-mode
+        ;; If font-lock is not enabled, we don't have the hooks in place to
+        ;; track modifications, so a subsequent call to font-lock-ensure can't
+        ;; assume that the fontification is still valid.
+        (setq font-lock-fontified nil))))
   "Function to make sure a region has been fontified.
 Called with two arguments BEG and END.")