From: yamaoka <yamaoka>
Date: Thu, 20 Feb 2003 23:07:24 +0000 (+0000)
Subject: Synch to Oort Gnus.
X-Git-Tag: t-gnus-6_15_17-00-quimby~53
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=885c12fb13c4fa489d2437a426773adb8e5d50e7;p=elisp%2Fgnus.git-

Synch to Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ba65fd1..317eef8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* message.el (message-resend): Bind message-setup-hook to nil;
+	remove X-Draft-From header.
+
 2003-02-20  Jesper Harder  <harder@ifa.au.dk>
 
 	* gnus-sum.el (gnus-simplify-subject-fully, gnus-subject-equal)
diff --git a/lisp/message.el b/lisp/message.el
index 06ee36f..e41148e 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6532,15 +6532,17 @@ Optional NEWS will use news to forward instead of mail."
       ;; We first set up a normal mail buffer.
       (unless (message-mail-user-agent)
 	(set-buffer (get-buffer-create " *message resend*"))
-	(erase-buffer)
-	(let ((message-this-is-mail t)
-	      ;; avoid to turn-on-mime-edit
-	      message-setup-hook)
-	  (message-setup `((To . ,address)))))
+	(erase-buffer))
+      (let ((message-this-is-mail t)
+	    message-setup-hook)
+	(message-setup `((To . ,address))))
       ;; Insert our usual headers.
       (message-generate-headers '(From Date To))
       (message-narrow-to-headers)
+      ;; Remove X-Draft-From header etc.
+      (message-remove-header message-ignored-mail-headers t)
       ;; Rename them all to "Resent-*".
+      (goto-char (point-min))
       (while (re-search-forward "^[A-Za-z]" nil t)
 	(forward-char -1)
 	(insert "Resent-"))