2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3073dd9499..1af9905c7e3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,11 @@
         * emacs-lisp/package.el (package-compute-transaction): Fix last fix.
         Suggested by Donald Curtis <dcurtis@coe.edu> (bug#14082).
 
+2013-04-05  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * 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  <chrzaszcz@mimuw.edu.pl> (tiny change)
 
         * ispell.el (ispell-set-spellchecker-params):
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index c32155f5430..68625e06acb 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -2243,7 +2243,8 @@ resultant list will be returned."
                  (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 @@ resultant list will be returned."
     (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)