(article-transform-date): Fix infinite recursion.

[gnus] / lisp / nndraft.el

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 157c65d..0063488 100644 (file)
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -1,7 +1,6 @@
 ;;; nndraft.el --- draft article access for Gnus
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2011 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -79,7 +78,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 +90,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 +221,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)))