X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fnndraft.el;h=764314de0af201d3ecb57f19b90521646469edfb;hp=1800d0c02de353ab235f262932e936f0dfbd1a27;hb=a0193b94630db19a690256aa42efbb0407734af1;hpb=55c26cf1a9939dc7b28fcbab35f1d05d56d53242

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 1800d0c02..764314de0 100644
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -1,6 +1,6 @@
 ;;; nndraft.el --- draft article access for Gnus
 
-;; Copyright (C) 1995-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2014 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -24,10 +24,6 @@
 
 ;;; Code:
 
-;; For Emacs <22.2 and XEmacs.
-(eval-and-compile
-  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
-
 (require 'nnheader)
 (require 'nnmail)
 (require 'gnus-start)
@@ -37,7 +33,8 @@
 (require 'mm-util)
 (eval-when-compile (require 'cl))
 
-(declare-function nndraft-request-list "nnmh" (&rest args))
+;; The nnoo-import at the end, I think.
+(declare-function nndraft-request-list "nndraft" (&rest args) t)
 
 (nnoo-declare nndraft
   nnmh)
@@ -254,11 +251,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)))
@@ -345,8 +347,7 @@ are generated if and only if they are also in `message-draft-headers'.")
    nnmh-retrieve-headers
    nnmh-request-group
    nnmh-close-group
-   nnmh-request-list
-   nnmh-request-newsgroups))
+   nnmh-request-list))
 
 (provide 'nndraft)