From 067b39d4296765e83f9530eca456168f6cda95fc Mon Sep 17 00:00:00 2001 From: Gnus developers Date: Wed, 5 Sep 2012 22:45:43 +0000 Subject: Merge changes made in Gnus master 2012-09-05 Magnus Henoch * nnmaildir.el (nnmaildir--article-set-flags): Fix compilation error. 2012-09-05 Martin Stjernholm * gnus-demon.el (gnus-demon-init): Fixed regression when IDLE is t and TIME is set. 2012-09-05 Juri Linkov * gnus-group.el (gnus-read-ephemeral-bug-group): Allow opening more than one group at a time (bug#11961). --- lisp/gnus/gnus-demon.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lisp/gnus/gnus-demon.el') diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el index 115c5777448..671c566d09f 100644 --- a/lisp/gnus/gnus-demon.el +++ b/lisp/gnus/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 -- cgit v1.2.3