# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1273557919 0
# Node ID 0eeae12a33a9e479e9cfcf68ea365a652a302b27
# Parent  21f80ea9c6a63865d7b6f9134e1382fa786b59b2# Parent  6232c848b863847ab2869508c1b791fc6ba9fac4
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 -r 21f80ea9c6a6 -r 0eeae12a33a9 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Tue May 11 04:44:44 2010 +0000
+++ b/lisp/gnus/ChangeLog	Tue May 11 06:05:19 2010 +0000
@@ -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 -r 21f80ea9c6a6 -r 0eeae12a33a9 lisp/gnus/gnus-sum.el
--- a/lisp/gnus/gnus-sum.el	Tue May 11 04:44:44 2010 +0000
+++ b/lisp/gnus/gnus-sum.el	Tue May 11 06:05:19 2010 +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))))