(gnus-demon-init): Fixed regression when IDLE is t and TIME is set.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b2be2f..a123ed9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-05  Martin Stjernholm  <mast@lysator.liu.se>
+
+       * gnus-demon.el (gnus-demon-init): Fixed regression when IDLE is t and
+       TIME is set.
+
 2012-09-05  Juri Linkov  <juri@jurta.org>
 
        * gnus-group.el (gnus-read-ephemeral-bug-group): Allow opening more

diff --git a/lisp/gnus-demon.el b/lisp/gnus-demon.el
index 115c577..671c566 100644 (file)
--- a/lisp/gnus-demon.el
+++ b/lisp/gnus-demon.el
@@ -144,9 +144,12 @@ marked with SPECIAL."
                        (* (gnus-demon-time-to-step time) gnus-demon-timestep))
                        (t
                        (* time gnus-demon-timestep))))
-           (idle (if (numberp idle)
-                     (* idle gnus-demon-timestep)
-                   idle))
+          (idle (cond ((numberp idle)
+                       (* idle gnus-demon-timestep))
+                      ((and (eq idle t) (numberp time))
+                       time)
+                      (t
+                       idle)))
 
            (timer
             (cond