Synch with Gnus trunk.

(gnus-summary-kill-thread): Use gnus-summary-mark-article instead of
 g-s-m-a-as-unread to set the expirable mark.  (Bug#5284)
 By Andreas Seltenreich <seltenreich (at) gmx.de>.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 71dc9727b4af62a4a81795bca3dc89cacbff9007..97cbb0ca8fe01d26affa487ff95a738d5d6ae19e 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-11  Andreas Seltenreich  <seltenreich@gmx.de>
+
+       * gnus-sum.el (gnus-summary-kill-thread): Use gnus-summary-mark-article
+       instead of g-s-m-a-as-unread to set the expirable mark.  (Bug#5284)
+
 2010-05-11  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-extern.el (mm-extern-url): Don't use

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index c142e7d657150a63fdb05a57e4b750d235bdc647..a0943493844b52c36738c3061a48cb11e113e368 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -11508,7 +11508,7 @@ If the prefix argument is negative, tick articles instead."
              ((> unmark 0)
               (gnus-summary-mark-article-as-unread gnus-unread-mark))
              ((= unmark 0)
-              (gnus-summary-mark-article-as-unread gnus-expirable-mark))
+              (gnus-summary-mark-article nil gnus-expirable-mark))
              (t
               (gnus-summary-mark-article-as-unread gnus-ticked-mark)))
        (setq articles (cdr articles))))