summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2010-05-11 06:04:22 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2010-05-11 06:04:22 +0000
commit4767419a31105c2a5077ca35263507c8e5991d8d (patch)
tree36fe611e96b45ab870b90932c22e00b423974127 /lisp
parent3d73e84152c941cc4a1e2de64926efd21710f535 (diff)
downloademacs-4767419a31105c2a5077ca35263507c8e5991d8d.tar.gz
emacs-4767419a31105c2a5077ca35263507c8e5991d8d.tar.bz2
emacs-4767419a31105c2a5077ca35263507c8e5991d8d.zip
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>.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/gnus-sum.el2
2 files changed, 6 insertions, 1 deletions
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 <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 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))))