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

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 111396
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2013-01-02 09:20:32 +0000
message:
  Merge changes made in Gnus master
  
  lisp/gnus/gnus-msg.el: Don't do Gcc handling if Gnus isn't running
  lisp/gnus/nnimap.el: Make nnimap treat \Deleted articles as \Read articles
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-msg.el
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-12-30 18:09:01 +0000
+++ b/lisp/gnus/ChangeLog       2013-01-02 09:20:32 +0000
@@ -1,3 +1,12 @@
+2012-12-31  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus-msg.el (gnus-inews-insert-gcc): Don't insert Gcc headers if Gnus
+       isn't running, because Gnus will probably not know how to handle the
+       Gcc header (bug#11941).
+
+       * nnimap.el (nnimap-update-info): Treat \Deleted articles as \Read
+       articles.
+
 2012-12-29  Lars Magne Ingebrigtsen  <address@hidden>
 
        * nnfolder.el (nnfolder-recursive-directory-files): New function.

=== modified file 'lisp/gnus/gnus-msg.el'
--- a/lisp/gnus/gnus-msg.el     2012-12-30 18:09:01 +0000
+++ b/lisp/gnus/gnus-msg.el     2013-01-02 09:20:32 +0000
@@ -1745,7 +1745,8 @@
              (setq var (cdr var)))
            result)))
         name)
-    (when (or groups gcc-self-val)
+    (when (and (or groups gcc-self-val)
+              (gnus-alive-p))
       (when (stringp groups)
        (setq groups (list groups)))
       (save-excursion

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2012-12-27 08:21:08 +0000
+++ b/lisp/gnus/nnimap.el       2013-01-02 09:20:32 +0000
@@ -1420,7 +1420,9 @@
                     (gnus-set-difference
                      (gnus-set-difference
                       existing
-                      (cdr (assoc '%Seen flags)))
+                      (gnus-sorted-union
+                       (cdr (assoc '%Seen flags))
+                       (cdr (assoc '%Deleted flags))))
                      (cdr (assoc '%Flagged flags)))))
                   (read (gnus-range-difference
                          (cons start-article high) unread)))