comparison lisp/mail/sendmail.el @ 13090:b9cc587a5d8b

(sendmail-send-it): Handle FCC after all text changes. (mail-do-fcc): Don't add From field here.

13089:c18fa2e296f9

	  ;; ignore any blank lines in the header
	  (while (and (re-search-forward "\n\n\n*" delimline t)
		      (< (point) delimline))
	    (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
		      (narrow-to-region (point)

	    ;; Insert an extra newline if we need it to work around
	    ;; Sun's bug that swallows newlines.
	    (goto-char (1+ delimline))
	    (if (eval mail-mailer-swallows-blank-line)
		(newline))
	    (if mail-interactive
		(save-excursion
		  (set-buffer errbuf)
		  (erase-buffer))))
	  (apply 'call-process-region

			    (progn
			      (rmail-maybe-set-message-counters)
			      (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-_")
			      (goto-char (point-min))
			      (widen)

		(save-excursion
		  (set-buffer (get-buffer-create " mail-temp"))
		  (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-_")
		  (write-region (point-min) (point-max) (car fcc-list) t)
		  (erase-buffer))

13090:b9cc587a5d8b

	  ;; ignore any blank lines in the header
	  (while (and (re-search-forward "\n\n\n*" delimline t)
		      (< (point) delimline))
	    (replace-match "\n"))
	  (let ((case-fold-search t))
	    (goto-char (point-min))
	    (while (re-search-forward "^Resent-to:" delimline t)
	      (setq resend-to-addresses
		    (save-restriction
		      (narrow-to-region (point)

	    ;; Insert an extra newline if we need it to work around
	    ;; Sun's bug that swallows newlines.
	    (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)
		  (erase-buffer))))
	  (apply 'call-process-region

			    (progn
			      (rmail-maybe-set-message-counters)
			      (widen)
			      (narrow-to-region (point-max) (point-max))
			      (insert "\C-l\n0, unseen,,\n*** EOOH ***\n"
				      "Date: " (mail-rfc822-date) "\n")
			      (insert-buffer-substring curbuf beg2 end)
			      (insert "\n\C-_")
			      (goto-char (point-min))
			      (widen)

		(save-excursion
		  (set-buffer (get-buffer-create " mail-temp"))
		  (setq buffer-read-only nil)
		  (erase-buffer)
		  (insert "\C-l\n0, unseen,,\n*** EOOH ***\n"
			  "Date: " (mail-rfc822-date) "\n")
		  (insert-buffer-substring curbuf beg2 end)
		  (insert "\n\C-_")
		  (write-region (point-min) (point-max) (car fcc-list) t)
		  (erase-buffer))