From: Michaël Cadilhac <michael.cadilhac@lrde.org>
Date: Mon, 24 Sep 2007 15:16:01 +0000 (+0000)
Subject: (whitespace-tickle-timer): Don't install the timer if
X-Git-Tag: emacs-pretest-23.0.90~10699
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f0fe5c145df2bb03a13afb8ffbc93b482505aa74;p=emacs.git

(whitespace-tickle-timer): Don't install the timer if
whitespace-rescan-timer-time is 0.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e19201b313c..c2d80dc0644 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-24  Micha,Ak(Bl Cadilhac  <michael@cadilhac.name>
+
+	* whitespace.el (whitespace-tickle-timer): Don't install the timer if
+	whitespace-rescan-timer-time is 0.
+
 2007-09-24  Karl Berry  <karl@gnu.org>
 
 	* international/mule.el (coding-system-base): Fix doc string grammar.
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 3ea8394b0b7..6e6aeb5fbb7 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -709,7 +709,9 @@ periodically for whitespace."
 If timer is not set, then set it to scan the files in
 `whitespace-all-buffer-files' periodically (defined by
 `whitespace-rescan-timer-time') for whitespace creep."
-  (if (and whitespace-rescan-timer-time (not whitespace-rescan-timer))
+  (if (and whitespace-rescan-timer-time
+	   (/= whitespace-rescan-timer-time 0)
+	   (not whitespace-rescan-timer))
       (setq whitespace-rescan-timer
 	    (add-timeout whitespace-rescan-timer-time
 			 'whitespace-rescan-files-in-buffers nil