[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master aa94f91 20/25: Be more careful when disabling/enabling fon
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master aa94f91 20/25: Be more careful when disabling/enabling font-lock. |
Date: |
Mon, 30 May 2016 22:10:45 +0000 (UTC) |
branch: master
commit aa94f91c85ae53724aa40419b8fd5784b4dd544b
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
Be more careful when disabling/enabling font-lock.
---
context-coloring.el | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/context-coloring.el b/context-coloring.el
index a20bfa6..9c2be91 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -419,16 +419,15 @@ Feature inspired by Douglas Crockford."
nil " Context" nil
(cond
(context-coloring-mode
- ;; Font lock is incompatible with this mode; the converse is also true.
- (font-lock-mode 0)
- (jit-lock-mode nil)
- ;; ...but we do use font-lock functions here.
- (font-lock-set-defaults)
- ;; Safely change the value of this function as necessary.
- (make-local-variable 'font-lock-syntactic-face-function)
(let ((dispatch (context-coloring-get-current-dispatch)))
(cond
(dispatch
+ ;; Font lock is incompatible with this mode; the converse is also true.
+ (font-lock-mode 0)
+ ;; ...but we do use font-lock functions here.
+ (font-lock-set-defaults)
+ ;; Safely change the value of this function as necessary.
+ (make-local-variable 'font-lock-syntactic-face-function)
(let ((setup (plist-get dispatch :setup)))
(when setup
(funcall setup))
@@ -443,8 +442,7 @@ Feature inspired by Douglas Crockford."
(let ((teardown (plist-get dispatch :teardown)))
(when teardown
(funcall teardown)))))
- (font-lock-mode)
- (jit-lock-mode t))))
+ (turn-on-font-lock-if-desired))))
(provide 'context-coloring)
- [elpa] master updated (5f6e9e7 -> 6ee4481), Jackson Ray Hamilton, 2016/05/30
- [elpa] master ce8ac8e 02/25: Add context-coloring-before-colorize abstraction., Jackson Ray Hamilton, 2016/05/30
- [elpa] master d346f82 08/25: Ignore packaging-generated files., Jackson Ray Hamilton, 2016/05/30
- [elpa] master d9c171b 10/25: Handle multiple files in coverage reports., Jackson Ray Hamilton, 2016/05/30
- [elpa] master e93ef84 14/25: Remove obsolete variables., Jackson Ray Hamilton, 2016/05/30
- [elpa] master 48cd90e 18/25: Tweak copyright lines., Jackson Ray Hamilton, 2016/05/30
- [elpa] master aa94f91 20/25: Be more careful when disabling/enabling font-lock.,
Jackson Ray Hamilton <=
- [elpa] master 3007b29 24/25: Version 8.0.1., Jackson Ray Hamilton, 2016/05/30
- [elpa] master a0e907a 01/25: Ensure js2-mode parses synchronously., Jackson Ray Hamilton, 2016/05/30
- [elpa] master 6c92cc2 19/25: Rename variable., Jackson Ray Hamilton, 2016/05/30
- [elpa] master ceece60 15/25: Trivial cleanup., Jackson Ray Hamilton, 2016/05/30
- [elpa] master f6401a6 17/25: Narrow scope of `make compile'., Jackson Ray Hamilton, 2016/05/30
- [elpa] master 09aef2a 09/25: Add an .elpaignore file., Jackson Ray Hamilton, 2016/05/30
- [elpa] master a9b988e 13/25: Fix improperly prepared test., Jackson Ray Hamilton, 2016/05/30
- [elpa] master 7d284ad 21/25: Remove overly-optimistic delay on Emacs Lisp coloring., Jackson Ray Hamilton, 2016/05/30
- [elpa] master d745846 07/25: Make js2-mode a development dependency., Jackson Ray Hamilton, 2016/05/30
- [elpa] master 455a743 22/25: Version 8.0.0., Jackson Ray Hamilton, 2016/05/30