summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2020-04-15 12:17:14 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2020-04-15 12:17:14 -0400
commit0ed7177696c8357f0b50d4c81a1f87e43db27e7c (patch)
treef430b4f26ec787e5524143ee332f993b1aa45eff
parenta5f7c269075180e4531f0a784201a09b49731a27 (diff)
downloademacs-0ed7177696c8357f0b50d4c81a1f87e43db27e7c.tar.gz
* lisp/htmlfontify.el (hfy-force-fontification): Fix bug#40642
Don't presume that `jit-lock-mode` is enabled. Do not merge to `master`.
-rw-r--r--lisp/htmlfontify.el3
1 files changed, 2 insertions, 1 deletions
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