branch: elpa/llama
commit ff77af7c5df678041aebb48497418ff8af0acefc
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Extend cooperation with morlock-mode
When that mode is disabled, then actually stop morlocking.
---
llama.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/llama.el b/llama.el
index 1c42bba893..7f4bc68906 100644
--- a/llama.el
+++ b/llama.el
@@ -464,8 +464,9 @@ expansion, and the looks of this face should hint at that.")
(let ((sym (intern-soft (match-string 1))))
(when (and (or (special-form-p sym)
(macrop sym)
- ;; Same as in advice of `morlock' package.
- (get sym 'morlock-font-lock-keyword))
+ (and (bound-and-true-p morlock-mode)
+ ;; Same as in advice of `morlock' package.
+ (get sym 'morlock-font-lock-keyword)))
(not (get sym 'no-font-lock-keyword))
(static-if (fboundp 'lisp--el-funcall-position-p) ;>= 28.1
(lisp--el-funcall-position-p (match-beginning 0))
