diff options
| author | Gnus developers <ding@gnus.org> | 2012-09-05 22:45:43 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-09-05 22:45:43 +0000 |
| commit | 067b39d4296765e83f9530eca456168f6cda95fc (patch) | |
| tree | 75523b9d24b8524d034bd47cad5a7e538ba3fbbe /lisp/gnus/gnus-demon.el | |
| parent | 350a188850c4eeceab0220ba1f6fdf98f0f57e93 (diff) | |
| download | emacs-067b39d4296765e83f9530eca456168f6cda95fc.tar.gz emacs-067b39d4296765e83f9530eca456168f6cda95fc.tar.bz2 emacs-067b39d4296765e83f9530eca456168f6cda95fc.zip | |
Merge changes made in Gnus master
2012-09-05 Magnus Henoch <magnus.henoch@gmail.com>
* nnmaildir.el (nnmaildir--article-set-flags): Fix compilation error.
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
than one group at a time (bug#11961).
Diffstat (limited to 'lisp/gnus/gnus-demon.el')
| -rw-r--r-- | lisp/gnus/gnus-demon.el | 9 |
1 files changed, 6 insertions, 3 deletions
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 |