Commit 9d9ffa13 authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen Committed by Katsumi Yamaoka
Browse files

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
parent 71376d4b
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.
......
......@@ -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
......
......@@ -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)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment