[Emacs-diffs] /srv/bzr/emacs/trunk r100228: Synch with Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 100228 [merge]
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2010-05-11 06:05:19 +0000
message:
  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>.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sum.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-05-11 04:43:46 +0000
+++ b/lisp/gnus/ChangeLog       2010-05-11 06:04:22 +0000
@@ -1,3 +1,8 @@
+2010-05-11  Andreas Seltenreich  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mm-extern.el (mm-extern-url): Don't use

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2010-05-10 12:07:40 +0000
+++ b/lisp/gnus/gnus-sum.el     2010-05-11 06:04:22 +0000
@@ -11508,7 +11508,7 @@
              ((> 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))))