Commit d6e000df authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(sendmail-send-it): Handle FCC after all text changes.

(mail-do-fcc): Don't add From field here.
parent 252fb32b
...@@ -485,11 +485,6 @@ the user from the mailer." ...@@ -485,11 +485,6 @@ the user from the mailer."
(replace-match "\n")) (replace-match "\n"))
(let ((case-fold-search t)) (let ((case-fold-search t))
(goto-char (point-min)) (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) (while (re-search-forward "^Resent-to:" delimline t)
(setq resend-to-addresses (setq resend-to-addresses
(save-restriction (save-restriction
...@@ -569,6 +564,10 @@ the user from the mailer." ...@@ -569,6 +564,10 @@ the user from the mailer."
(goto-char (1+ delimline)) (goto-char (1+ delimline))
(if (eval mail-mailer-swallows-blank-line) (if (eval mail-mailer-swallows-blank-line)
(newline)) (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 (if mail-interactive
(save-excursion (save-excursion
(set-buffer errbuf) (set-buffer errbuf)
...@@ -677,7 +676,6 @@ the user from the mailer." ...@@ -677,7 +676,6 @@ the user from the mailer."
(widen) (widen)
(narrow-to-region (point-max) (point-max)) (narrow-to-region (point-max) (point-max))
(insert "\C-l\n0, unseen,,\n*** EOOH ***\n" (insert "\C-l\n0, unseen,,\n*** EOOH ***\n"
"From: " (user-login-name) "\n"
"Date: " (mail-rfc822-date) "\n") "Date: " (mail-rfc822-date) "\n")
(insert-buffer-substring curbuf beg2 end) (insert-buffer-substring curbuf beg2 end)
(insert "\n\C-_") (insert "\n\C-_")
...@@ -704,7 +702,6 @@ the user from the mailer." ...@@ -704,7 +702,6 @@ the user from the mailer."
(setq buffer-read-only nil) (setq buffer-read-only nil)
(erase-buffer) (erase-buffer)
(insert "\C-l\n0, unseen,,\n*** EOOH ***\n" (insert "\C-l\n0, unseen,,\n*** EOOH ***\n"
"From: " (user-login-name) "\n"
"Date: " (mail-rfc822-date) "\n") "Date: " (mail-rfc822-date) "\n")
(insert-buffer-substring curbuf beg2 end) (insert-buffer-substring curbuf beg2 end)
(insert "\n\C-_") (insert "\n\C-_")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment