From: Katsumi Yamaoka Date: Tue, 11 May 2010 06:04:22 +0000 (+0000) Subject: Synch with Gnus trunk. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~211^2~16 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4767419a31105c2a5077ca35263507c8e5991d8d;p=emacs.git 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 . --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 71dc9727b4a..97cbb0ca8fe 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2010-05-11 Andreas Seltenreich + + * 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 * mm-extern.el (mm-extern-url): Don't use diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index c142e7d6571..a0943493844 100644 --- 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))))