Merge commit '5825163e2a8520bbb2751f9692f51a1b73cb81ad' from context-coloring

diff --git a/packages/context-coloring/README.md b/packages/context-coloring/README.md
index 03bf677a39ba970a6c9c325ad5d89db583d6054e..40506e76a36102927e5a9238e46f34e41e9012fc 100644 (file)
--- a/packages/context-coloring/README.md
+++ b/packages/context-coloring/README.md
@@ -18,9 +18,9 @@ By default, comments and strings are still highlighted syntactically.
   - Script, function and block scopes (and even `catch` block scopes).
   - Very fast for files under 1000 lines.
 - Emacs Lisp support:
-  - `defun`, `lambda`, `let`, `let*`, `cond`, `condition-case`, quotes,
-    backquotes (and splicing).
-  - 25,000 lines per second!
+  - `defun`, `lambda`, `let`, `let*`, `cond`, `condition-case`, `defadvice`,
+    `dolist`, `quote`, `backquote` and backquote splicing.
+  - Instantaneous lazy coloring, 8000 lines-per-second full coloring.
 
 ## Installation
 

diff --git a/packages/context-coloring/context-coloring.el b/packages/context-coloring/context-coloring.el
index 47ecf70c317a4eca98d856a515bbdbb0dfac9949..c4423f0277ad990e94ae18798015656341794e8a 100644 (file)
--- a/packages/context-coloring/context-coloring.el
+++ b/packages/context-coloring/context-coloring.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2014-2015  Free Software Foundation, Inc.
 
 ;; Author: Jackson Ray Hamilton <jackson@jacksonrayhamilton.com>
-;; Version: 6.4.0
+;; Version: 6.4.1
 ;; Keywords: convenience faces tools
 ;; Package-Requires: ((emacs "24") (js2-mode "20150126"))
 ;; URL: https://github.com/jacksonrayhamilton/context-coloring
@@ -150,7 +150,8 @@ START, END and LENGTH are recorded for later use."
 
 (defun context-coloring-maybe-colorize-with-buffer (buffer)
   "Color BUFFER and if it has changed."
-  (when context-coloring-changed-p
+  (when (and (eq buffer (current-buffer))
+             context-coloring-changed-p)
     (context-coloring-colorize-with-buffer buffer)
     (setq context-coloring-changed-p nil)
     (setq context-coloring-changed-start nil)