From 115694a3d83c3c248ad068a0330eea9e1eb4ff59 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Thu, 28 Mar 2013 01:36:23 +0000 Subject: [PATCH] lisp/gnus/nndraft.el (nndraft-request-expire-articles): Make expiry target always `delete' --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/nndraft.el | 15 ++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index cbfb0109aec..e42e7606313 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2013-03-28 Katsumi Yamaoka + + * nndraft.el (nndraft-request-expire-articles): + Make expiry target always `delete'. + 2013-03-27 Andrew Cohen * gnus-msg.el (gnus-setup-message): When replying from an nnir summary diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el index b19b56ae6ea..c9625f4c447 100644 --- a/lisp/gnus/nndraft.el +++ b/lisp/gnus/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))) -- 2.39.2