[Emacs-diffs] emacs-24 90b46f5: lisp/gnus/nnmh.el (nnmh-request-expire-articles): Work for the case nnmail-expiry-target is an nnmh group (bug#20170)

[Katsumi Yamaoka]

branch: emacs-24
commit 90b46f5b54b8eda06e2c5bcd13d9c6475afe767b
Author: Ben Bacarisse <address@hidden>
Commit: Katsumi Yamaoka <address@hidden>

    lisp/gnus/nnmh.el (nnmh-request-expire-articles): Work for the case 
nnmail-expiry-target is an nnmh group (bug#20170)
---
 lisp/gnus/ChangeLog |    5 +++++
 lisp/gnus/nnmh.el   |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 592f34d..1c8dff6 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-23  Ben Bacarisse  <address@hidden>  (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  <address@hidden>
 
        * message.el (message-smtpmail-send-it): Remove the mail header
diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index 9be0c14..04270a5 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