[Emacs-diffs] /srv/bzr/emacs/trunk r109895: Merge changes made in Gnus master

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 109895
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2012-09-05 22:45:43 +0000
message:
  Merge changes made in Gnus master
  
  2012-09-05  Magnus Henoch  <address@hidden>
  * nnmaildir.el (nnmaildir--article-set-flags): Fix compilation error.
  
  2012-09-05  Martin Stjernholm  <address@hidden>
  * gnus-demon.el (gnus-demon-init): Fixed regression when IDLE is t and
    TIME is set.
  
  2012-09-05  Juri Linkov  <address@hidden>
  * gnus-group.el (gnus-read-ephemeral-bug-group): Allow opening more
    than one group at a time (bug#11961).
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-demon.el
  lisp/gnus/gnus-group.el
  lisp/gnus/nnmaildir.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-09-05 22:35:32 +0000
+++ b/lisp/gnus/ChangeLog       2012-09-05 22:45:43 +0000
@@ -1,3 +1,17 @@
+2012-09-05  Magnus Henoch  <address@hidden>
+
+       * nnmaildir.el (nnmaildir--article-set-flags): Fix compilation error.
+
+2012-09-05  Martin Stjernholm  <address@hidden>
+
+       * gnus-demon.el (gnus-demon-init): Fixed regression when IDLE is t and
+       TIME is set.
+
+2012-09-05  Juri Linkov  <address@hidden>
+
+       * gnus-group.el (gnus-read-ephemeral-bug-group): Allow opening more
+       than one group at a time (bug#11961).
+
 2012-09-05  Julien Danjou  <address@hidden>
 
        * gnus-srvr.el (gnus-server-open-server): Don't message on failure:

=== modified file 'lisp/gnus/gnus-demon.el'
--- a/lisp/gnus/gnus-demon.el   2012-08-06 11:56:36 +0000
+++ b/lisp/gnus/gnus-demon.el   2012-09-05 22:45:43 +0000
@@ -144,9 +144,12 @@
                        (* (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

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2012-09-05 22:35:32 +0000
+++ b/lisp/gnus/gnus-group.el   2012-09-05 22:45:43 +0000
@@ -2481,7 +2481,8 @@
                         "/.*$" ""))))
       (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))

=== modified file 'lisp/gnus/nnmaildir.el'
--- a/lisp/gnus/nnmaildir.el    2012-09-05 22:35:32 +0000
+++ b/lisp/gnus/nnmaildir.el    2012-09-05 22:45:43 +0000
@@ -127,16 +127,6 @@
         (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 @@
   (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))