summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Bacarisse <ben.lists@bsb.me.uk>2015-03-23 08:02:01 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2015-03-23 08:02:01 +0000
commit90b46f5b54b8eda06e2c5bcd13d9c6475afe767b (patch)
treef932a93f7d5a86ea6186661a823f92b3d68bbd1c
parente7f92aa3d3fb7d5cf88eef374eaeba4dc6b8984f (diff)
downloademacs-90b46f5b54b8eda06e2c5bcd13d9c6475afe767b.tar.gz
lisp/gnus/nnmh.el (nnmh-request-expire-articles): Work for the case nnmail-expiry-target is an nnmh group (bug#20170)
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/nnmh.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 592f34d6fbf..1c8dff615d8 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-23 Ben Bacarisse <ben.lists@bsb.me.uk> (tiny change)
+
+ * nnmh.el (nnmh-request-expire-articles):
+ Work for the case nnmail-expiry-target is an nnmh group (bug#20170).
+
2015-01-29 Lars Ingebrigtsen <larsi@gnus.org>
* message.el (message-smtpmail-send-it): Remove the mail header
diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index 9be0c14884e..04270a554cf 100644
--- a/lisp/gnus/nnmh.el
+++ b/lisp/gnus/nnmh.el
@@ -259,12 +259,12 @@ as unread by Gnus.")
&optional server force)
(nnmh-possibly-change-directory newsgroup server)
(let ((is-old t)
+ (dir nnmh-current-directory)
article rest mod-time)
(nnheader-init-server-buffer)
(while (and articles is-old)
- (setq article (concat nnmh-current-directory
- (int-to-string (car articles))))
+ (setq article (concat dir (int-to-string (car articles))))
(when (setq mod-time (nth 5 (file-attributes article)))
(if (and (nnmh-deletable-article-p newsgroup (car articles))
(setq is-old