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 | |
| parent | 350a188850c4eeceab0220ba1f6fdf98f0f57e93 (diff) | |
| download | emacs-067b39d4296765e83f9530eca456168f6cda95fc.tar.gz | |
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')
| -rw-r--r-- | lisp/gnus/ChangeLog | 14 | ||||
| -rw-r--r-- | lisp/gnus/gnus-demon.el | 9 | ||||
| -rw-r--r-- | lisp/gnus/gnus-group.el | 3 | ||||
| -rw-r--r-- | lisp/gnus/nnmaildir.el | 20 |
4 files changed, 32 insertions, 14 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index c6220204511..d3398aa1d8d 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,17 @@ +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). + 2012-09-05 Julien Danjou <julien@danjou.info> * gnus-srvr.el (gnus-server-open-server): Don't message on failure: 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 diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index 37e4470239e..71af5792d2c 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -2481,7 +2481,8 @@ the bug number, and browsing the URL must return mbox output." "/.*$" "")))) (write-region (point-min) (point-max) tmpfile) (gnus-group-read-ephemeral-group - "gnus-read-ephemeral-bug" + (format "gnus-read-ephemeral-bug:%s" + (mapconcat 'number-to-string ids ",")) `(nndoc ,tmpfile (nndoc-article-type mbox)) nil window-conf)) diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el index caf28202f04..327649d41a1 100644 --- a/lisp/gnus/nnmaildir.el +++ b/lisp/gnus/nnmaildir.el @@ -127,16 +127,6 @@ SUFFIX should start with \":2,\"." (new-flags (concat (delq flag flags-as-list)))) (concat ":2," new-flags))) -(defun nnmaildir--article-set-flags (article new-suffix curdir) - (let* ((prefix (nnmaildir--art-prefix article)) - (suffix (nnmaildir--art-suffix article)) - (article-file (concat curdir prefix suffix)) - (new-name (concat curdir prefix new-suffix))) - (unless (file-exists-p article-file) - (error "Couldn't find article file %s" article-file)) - (rename-file article-file new-name 'replace) - (setf (nnmaildir--art-suffix article) new-suffix))) - (defvar nnmaildir-article-file-name nil "*The filename of the most recently requested article. This variable is set by nnmaildir-request-article.") @@ -212,6 +202,16 @@ by nnmaildir-request-article.") (gnm nil) ;; flag: split from mail-sources? (target-prefix nil :type string)) ;; symlink target prefix +(defun nnmaildir--article-set-flags (article new-suffix curdir) + (let* ((prefix (nnmaildir--art-prefix article)) + (suffix (nnmaildir--art-suffix article)) + (article-file (concat curdir prefix suffix)) + (new-name (concat curdir prefix new-suffix))) + (unless (file-exists-p article-file) + (error "Couldn't find article file %s" article-file)) + (rename-file article-file new-name 'replace) + (setf (nnmaildir--art-suffix article) new-suffix))) + (defun nnmaildir--expired-article (group article) (setf (nnmaildir--art-nov article) nil) (let ((flist (nnmaildir--grp-flist group)) |