nndraft.el (nndraft-request-expire-articles): Make expiry target always `delete'

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89e5de9..55dc9aa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nndraft.el (nndraft-request-expire-articles):
+       Make expiry target always `delete'.
+
 2013-03-27  Andrew Cohen  <cohen@bu.edu>
 
        * gnus-msg.el (gnus-setup-message): When replying from an nnir summary

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index b19b56a..c9625f4 100644 (file)
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -255,11 +255,16 @@ are generated if and only if they are also in `message-draft-headers'.")
 (deffoo nndraft-request-expire-articles (articles group &optional server force)
   (nndraft-possibly-change-group group)
   (let* ((nnmh-allow-delete-final t)
-        (nnmail-expiry-target
-         (or (gnus-group-find-parameter
-              (gnus-group-prefixed-name group (list 'nndraft server))
-              'expiry-target t)
-             nnmail-expiry-target))
+        (nnmail-expiry-target 'delete)
+        ;; FIXME: If we want to move a draft message to an expiry group,
+        ;; there are things to have to improve:
+        ;; - Remove a header separator.
+        ;; - Encode it, including attachments, into a MIME message.
+        ;;(nnmail-expiry-target
+        ;; (or (gnus-group-find-parameter
+        ;;      (gnus-group-prefixed-name group (list 'nndraft server))
+        ;;      'expiry-target t)
+        ;;     nnmail-expiry-target))
         (res (nnoo-parent-function 'nndraft
                                    'nnmh-request-expire-articles
                                    (list articles group server force)))