aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Gole2010-08-08 22:23:35 -0400
committerChong Yidong2010-08-08 22:23:35 -0400
commit1fcf76afe76188b1f555f3e9b619fee70907d4c8 (patch)
tree2a63557f8278c9ed83e96ffe21e7b67224411860
parente54a1075033073f835596ab666eeed099028beb8 (diff)
downloademacs-1fcf76afe76188b1f555f3e9b619fee70907d4c8.tar.gz
emacs-1fcf76afe76188b1f555f3e9b619fee70907d4c8.zip
* whitespace.el (whitespace-color-off): Remove post-command-hook locally.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/whitespace.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a37cf2dfb4..0bdb6535045 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-08-09 Geoff Gole <geoffgole@gmail.com> (tiny change)
2
3 * whitespace.el (whitespace-color-off): Remove post-command-hook
4 locally.
5
12010-08-08 Johan Bockgård <bojohan@gnu.org> 62010-08-08 Johan Bockgård <bojohan@gnu.org>
2 7
3 * replace.el (replace-highlight): Bind isearch-forward and 8 * replace.el (replace-highlight): Bind isearch-forward and
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 183698a28f3..5c7d4e95caf 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -2297,7 +2297,7 @@ resultant list will be returned."
2297 ;; turn off font lock 2297 ;; turn off font lock
2298 (when (whitespace-style-face-p) 2298 (when (whitespace-style-face-p)
2299 (font-lock-mode 0) 2299 (font-lock-mode 0)
2300 (remove-hook 'post-command-hook #'whitespace-post-command-hook) 2300 (remove-hook 'post-command-hook #'whitespace-post-command-hook t)
2301 (when whitespace-font-lock 2301 (when whitespace-font-lock
2302 (setq whitespace-font-lock nil 2302 (setq whitespace-font-lock nil
2303 font-lock-keywords whitespace-font-lock-keywords)) 2303 font-lock-keywords whitespace-font-lock-keywords))