[Emacs-diffs] /srv/bzr/emacs/trunk r112163: lisp/gnus/nndraft.el (nndraft-request-expire-articles): Make expiry target always `delete'

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 112163
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2013-03-28 01:36:23 +0000
message:
  lisp/gnus/nndraft.el (nndraft-request-expire-articles): Make expiry target 
always `delete'
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nndraft.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-03-27 22:12:36 +0000
+++ b/lisp/gnus/ChangeLog       2013-03-28 01:36:23 +0000
@@ -1,3 +1,8 @@
+2013-03-28  Katsumi Yamaoka  <address@hidden>
+
+       * nndraft.el (nndraft-request-expire-articles):
+       Make expiry target always `delete'.
+
 2013-03-27  Andrew Cohen  <address@hidden>
 
        * gnus-msg.el (gnus-setup-message): When replying from an nnir summary

=== modified file 'lisp/gnus/nndraft.el'
--- a/lisp/gnus/nndraft.el      2013-03-06 03:55:49 +0000
+++ b/lisp/gnus/nndraft.el      2013-03-28 01:36:23 +0000
@@ -255,11 +255,16 @@
 (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)))