X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnndraft.el;h=98c14d4cab266f9482fd51567cd83aa14873d2cf;hb=5468e915c342bcc54b4aa87f69742ed61587a21c;hp=157c65da8d141e2daa9e0dd7d77f7bcc6410c0ae;hpb=aaff5cad4b7225cd056a7c322950b9887e3442c0;p=gnus

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 157c65da8..98c14d4ca 100644
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -79,7 +79,7 @@ are generated if and only if they are also in `message-draft-headers'.")
   (nndraft-possibly-change-group group)
   (with-current-buffer nntp-server-buffer
     (erase-buffer)
-    (let* (article)
+    (let (article lines chars)
       ;; We don't support fetching by Message-ID.
       (if (stringp (car articles))
 	  'headers
@@ -91,9 +91,12 @@ are generated if and only if they are also in `message-draft-headers'.")
 	    (if (search-forward "\n\n" nil t)
 		(forward-line -1)
 	      (goto-char (point-max)))
+	    (setq lines (count-lines (point) (point-max))
+		  chars (- (point-max) (point)))
 	    (delete-region (point) (point-max))
 	    (goto-char (point-min))
 	    (insert (format "221 %d Article retrieved.\n" article))
+	    (insert (format "Lines: %d\nChars: %d\n" lines chars))
 	    (widen)
 	    (goto-char (point-max))
 	    (insert ".\n")))
@@ -219,6 +222,11 @@ 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))
 	 (res (nnoo-parent-function 'nndraft
 				    'nnmh-request-expire-articles
 				    (list articles group server force)))