From: Ben Bacarisse <ben.lists@bsb.me.uk>
Date: Mon, 23 Mar 2015 22:21:54 +0000 (+0000)
Subject: nnmh.el (nnmh-request-expire-articles): Work for the case nnmail-expiry-target is... 
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=441fce6b76559fdb536106a0518551c01d0e26a9;ds=sidebyside

nnmh.el (nnmh-request-expire-articles): Work for the case nnmail-expiry-target is an nnmh group (bug#20170)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 02e65c1c8..b975dc7ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/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-03-21  Eric Abrahamsen  <eric@ericabrahamsen.net>
 
 	* registry.el (registry-lookup-secondary, registry-full)
diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index 9be0c1488..04270a554 100644
--- a/lisp/nnmh.el
+++ b/lisp/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