From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 15 Apr 2020 16:17:14 +0000 (-0400)
Subject: * lisp/htmlfontify.el (hfy-force-fontification): Fix bug#40642
X-Git-Tag: emacs-27.0.91~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ed7177696;p=emacs.git

* lisp/htmlfontify.el (hfy-force-fontification): Fix bug#40642

Don't presume that `jit-lock-mode` is enabled.
Do not merge to `master`.
---

diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index c0012427ae1..08e52d63a26 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -1837,7 +1837,8 @@ fontified.  This is a simple convenience wrapper around
       (when font-lock-defaults
         ; Silence "interactive use only" warning on Emacs >= 25.1.
         (with-no-warnings (font-lock-fontify-buffer)))))
-   ((fboundp #'jit-lock-fontify-now)
+   ((and (fboundp #'jit-lock-fontify-now)
+         (bound-and-true-p jit-lock-mode))
     (message "hfy jit-lock mode (%S %S)" window-system major-mode)
     (jit-lock-fontify-now))
    (t