From: Julien Danjou <julien@danjou.info>
Date: Fri, 3 Dec 2010 22:05:02 +0000 (-0500)
Subject: gnus-demon.el (gnus-demon-init): Fix time computing when time is nil.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~52
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ce4202f43d64c9c021b599f204d30c484586372;p=emacs.git

gnus-demon.el (gnus-demon-init): Fix time computing when time is nil.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 302a1c5e97d..068ca8d0e08 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-03  Julien Danjou  <julien@danjou.info>
+
+	* gnus-demon.el (gnus-demon-init): Fix time computing when time is nil.
+
 2010-12-03  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-util.el (gnus-macroexpand-all): Don't modify argument;
diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el
index 94a49525847..b33a673c354 100644
--- a/lisp/gnus/gnus-demon.el
+++ b/lisp/gnus/gnus-demon.el
@@ -121,7 +121,7 @@ Emacs has been idle for IDLE `gnus-demon-timestep's."
            ;; If t, replace by 1
            (time (cond ((eq time t)
                         gnus-demon-timestep)
-                       ((null time))
+                       ((null time) nil)
                        (t (* time gnus-demon-timestep))))
            (timer
             (cond