From 21beb19d80b6aba2c2b736b3e1d031f1ef0e743d Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 25 Jan 2016 09:28:37 -0500 Subject: [PATCH] (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). --- lisp/font-lock.el | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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.") -- 2.39.5