* nnmh.el (nnmh-request-expire-articles): Prefer expiry-target group parameter.

* message.el (message-disassociate-draft): Specify drafts group name fully.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee20ece..219d9cb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-18  Nils Ackermann  <nils@ackermath.info>  (tiny change)
+
+       * nnmh.el (nnmh-request-expire-articles): Prefer expiry-target group
+       parameter.
+
+       * message.el (message-disassociate-draft): Specify drafts group name
+       fully.
+
 2008-03-17  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus-registry.el (gnus-registry-split-fancy-with-parent): Eliminate

diff --git a/lisp/message.el b/lisp/message.el
index 44c282b..6e782ea 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6241,7 +6241,7 @@ are not included."
   "Disassociate the message buffer from the drafts directory."
   (when message-draft-article
     (nndraft-request-expire-articles
-     (list message-draft-article) "drafts" nil t)))
+     (list message-draft-article) "nndraft:drafts" nil t)))
 
 (defun message-insert-headers ()
   "Generate the headers for the article."

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index 11ad0dd..88730a2 100644 (file)
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -253,8 +253,11 @@ as unread by Gnus.")
 (deffoo nnmh-request-expire-articles (articles newsgroup
                                               &optional server force)
   (nnmh-possibly-change-directory newsgroup server)
-  (let* ((is-old t)
-        article rest mod-time)
+  (let ((is-old t)
+       (nnmail-expiry-target
+        (or (gnus-group-find-parameter newsgroup 'expiry-target t)
+            nnmail-expiry-target))
+       article rest mod-time)
     (nnheader-init-server-buffer)
 
     (while (and articles is-old)