[Emacs-diffs] /srv/bzr/emacs/trunk r112232: * lisp/whitespace.el (whitespace-color-on, whitespace-color-off): Only

[Dmitry Gutov]

------------------------------------------------------------
revno: 112232
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Sat 2013-04-06 02:22:12 +0400
message:
  * lisp/whitespace.el (whitespace-color-on, whitespace-color-off): Only
  call `font-lock-fontify-buffer' when `font-lock-mode' is on.
modified:
  lisp/ChangeLog
  lisp/whitespace.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-04-05 18:46:59 +0000
+++ b/lisp/ChangeLog    2013-04-05 22:22:12 +0000
@@ -3,6 +3,11 @@
        * emacs-lisp/package.el (package-compute-transaction): Fix last fix.
        Suggested by Donald Curtis <address@hidden> (bug#14082).
 
+2013-04-05  Dmitry Gutov  <address@hidden>
+
+       * whitespace.el (whitespace-color-on, whitespace-color-off): Only
+       call `font-lock-fontify-buffer' when `font-lock-mode' is on.
+
 2013-04-05  Jacek Chrząszcz  <address@hidden> (tiny change)
 
        * ispell.el (ispell-set-spellchecker-params):

=== modified file 'lisp/whitespace.el'
--- a/lisp/whitespace.el        2013-03-19 15:12:40 +0000
+++ b/lisp/whitespace.el        2013-04-05 22:22:12 +0000
@@ -2243,7 +2243,8 @@
                  (whitespace-space-after-tab-regexp 'space)))
               1 whitespace-space-after-tab t)))))
     (font-lock-add-keywords nil whitespace-font-lock-keywords t)
-    (font-lock-fontify-buffer)))
+    (when font-lock-mode
+      (font-lock-fontify-buffer))))
 
 
 (defun whitespace-color-off ()
@@ -2253,7 +2254,8 @@
     (remove-hook 'post-command-hook #'whitespace-post-command-hook t)
     (remove-hook 'before-change-functions #'whitespace-buffer-changed t)
     (font-lock-remove-keywords nil whitespace-font-lock-keywords)
-    (font-lock-fontify-buffer)))
+    (when font-lock-mode
+      (font-lock-fontify-buffer))))
 
 
 (defun whitespace-trailing-regexp (limit)