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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6dca9e6cb7c3d37b99b4325187d23e05ae8ce137..044903b0cb87572fa0583b0c11ec5a288ee07ef1 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2012-12-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * 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  <larsi@gnus.org>
 
        * nnfolder.el (nnfolder-recursive-directory-files): New function.

diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index c967bc06565b0f2520d629eaf7b96407ea14330f..559c5bbce1e23adda0ee6e96ef68a9bb95ddad67 100644 (file)
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1745,7 +1745,8 @@ this is a reply."
              (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

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 38ece41ad37bbe8513bcb09b91a2e8f6d76ac774..5a8d0d6a1fa429418f0d886fe18c52a6f17d2457 100644 (file)
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1420,7 +1420,9 @@ textual parts.")
                     (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)))