[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 550e61b 08/21: Merge branch 'master' into prettify-symbols
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master 550e61b 08/21: Merge branch 'master' into prettify-symbols |
Date: |
Fri, 23 Dec 2016 20:27:51 +0000 (UTC) |
branch: master
commit 550e61bac97e69b66de4a50bf36e963c7eb4c01c
Merge: 26f48c5 5fe3695
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
Merge branch 'master' into prettify-symbols
---
context-coloring.el | 1 -
1 file changed, 1 deletion(-)
diff --git a/context-coloring.el b/context-coloring.el
index 0d5b72c..f7104ed 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -501,7 +501,6 @@ Feature inspired by Douglas Crockford."
(let ((teardown (plist-get dispatch :teardown)))
(when teardown
(funcall teardown)))))
- (kill-local-variable 'font-lock-syntactic-face-function)
(turn-on-font-lock-if-desired))))
(provide 'context-coloring)
- [elpa] master 3e778f6 18/21: Merge pull request #6 from jacksonrayhamilton/narrow-to-region, (continued)
- [elpa] master 3e778f6 18/21: Merge pull request #6 from jacksonrayhamilton/narrow-to-region, Jackson Ray Hamilton, 2016/12/23
- [elpa] master 26f48c5 06/21: Improve Font Lock integration., Jackson Ray Hamilton, 2016/12/23
- [elpa] master c847b0f 01/21: Mention tern-context-coloring in README., Jackson Ray Hamilton, 2016/12/23
- [elpa] master 54593e5 11/21: Add Emacs 25.1 to the build matrix., Jackson Ray Hamilton, 2016/12/23
- [elpa] master abded5f 14/21: Check for compositions on old Emacsen., Jackson Ray Hamilton, 2016/12/23
- [elpa] master 269a382 15/21: Ensure coloring still works after prettification., Jackson Ray Hamilton, 2016/12/23
- [elpa] master b3ea138 19/21: Remove no-byte-compile from development files., Jackson Ray Hamilton, 2016/12/23
- [elpa] master ce29abd 17/21: Don't color before or beyond the buffer., Jackson Ray Hamilton, 2016/12/23
- [elpa] master 45b5ad0 16/21: Merge pull request #5 from jacksonrayhamilton/prettify-symbols, Jackson Ray Hamilton, 2016/12/23
- [elpa] master 5fe3695 07/21: Revert "Clean up local variable.", Jackson Ray Hamilton, 2016/12/23
- [elpa] master 550e61b 08/21: Merge branch 'master' into prettify-symbols,
Jackson Ray Hamilton <=
- [elpa] master a1a6256 05/21: Set up post-colorize hooks., Jackson Ray Hamilton, 2016/12/23
- [elpa] master 4836dd0 10/21: Add tests for prettifying symbols., Jackson Ray Hamilton, 2016/12/23
- [elpa] master edbb191 13/21: Feature-detect prettify-symbols-mode for Emacs 24.3 compat., Jackson Ray Hamilton, 2016/12/23
- [elpa] master 3985437 09/21: Use a mode hook for detecting entering Prettify Symbols mode., Jackson Ray Hamilton, 2016/12/23
- [elpa] master 1b30a28 20/21: Version 8.1.0., Jackson Ray Hamilton, 2016/12/23
- [elpa] master 5402f35 21/21: Merge commit '1b30a28857727202d1f6a027f83ad66151fb1e92' from context-coloring, Jackson Ray Hamilton, 2016/12/23