diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2013-01-02 09:20:32 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2013-01-02 09:20:32 +0000 |
| commit | 9d9ffa13100af63fdb4fd2c6d2595d8abc0dde8b (patch) | |
| tree | e6ad90d34925fee6d6bf25931642c2c23b5167f5 /lisp/gnus | |
| parent | 71376d4b88555139065d6ac862734d7e5c14f043 (diff) | |
| download | emacs-9d9ffa13100af63fdb4fd2c6d2595d8abc0dde8b.tar.gz emacs-9d9ffa13100af63fdb4fd2c6d2595d8abc0dde8b.tar.bz2 emacs-9d9ffa13100af63fdb4fd2c6d2595d8abc0dde8b.zip | |
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
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/gnus/gnus-msg.el | 3 | ||||
| -rw-r--r-- | lisp/gnus/nnimap.el | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 6dca9e6cb7c..044903b0cb8 100644 --- 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 c967bc06565..559c5bbce1e 100644 --- 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 38ece41ad37..5a8d0d6a1fa 100644 --- 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))) |