# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 812255684 0
# Node ID b9cc587a5d8b4e9c2d78c664243dd5d9d2f4a732
# Parent  c18fa2e296f9bdfc9758cc13b3a6bbf2f8e10add
(sendmail-send-it): Handle FCC after all text changes.
(mail-do-fcc): Don't add From field here.

diff -r c18fa2e296f9 -r b9cc587a5d8b lisp/mail/sendmail.el
--- a/lisp/mail/sendmail.el	Wed Sep 27 17:39:32 1995 +0000
+++ b/lisp/mail/sendmail.el	Thu Sep 28 02:34:44 1995 +0000
@@ -485,11 +485,6 @@
 	    (replace-match "\n"))
 	  (let ((case-fold-search t))
 	    (goto-char (point-min))
-	    ;; Find and handle any FCC fields.
-	    (goto-char (point-min))
-	    (if (re-search-forward "^FCC:" delimline t)
-		(mail-do-fcc delimline))
-	    (goto-char (point-min))
 	    (while (re-search-forward "^Resent-to:" delimline t)
 	      (setq resend-to-addresses
 		    (save-restriction
@@ -569,6 +564,10 @@
 	    (goto-char (1+ delimline))
 	    (if (eval mail-mailer-swallows-blank-line)
 		(newline))
+	    ;; Find and handle any FCC fields.
+	    (goto-char (point-min))
+	    (if (re-search-forward "^FCC:" delimline t)
+		(mail-do-fcc delimline))
 	    (if mail-interactive
 		(save-excursion
 		  (set-buffer errbuf)
@@ -677,7 +676,6 @@
 			      (widen)
 			      (narrow-to-region (point-max) (point-max))
 			      (insert "\C-l\n0, unseen,,\n*** EOOH ***\n"
-				      "From: " (user-login-name) "\n"
 				      "Date: " (mail-rfc822-date) "\n")
 			      (insert-buffer-substring curbuf beg2 end)
 			      (insert "\n\C-_")
@@ -704,7 +702,6 @@
 		  (setq buffer-read-only nil)
 		  (erase-buffer)
 		  (insert "\C-l\n0, unseen,,\n*** EOOH ***\n"
-			  "From: " (user-login-name) "\n"
 			  "Date: " (mail-rfc822-date) "\n")
 		  (insert-buffer-substring curbuf beg2 end)
 		  (insert "\n\C-_")