From 180d5509171d16d6b8a74afa824d4318c57316c3 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Wed, 21 Mar 2001 10:29:26 +0000 Subject: [PATCH] (sendmail-send-it): Don't parse Resent-* headers. Always invoke sendmail with option -t. --- lisp/ChangeLog | 5 ++++ lisp/mail/sendmail.el | 53 +++++++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b3aaae58374..e0fa35fe339 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2001-03-21 Gerd Moellmann + + * mail/sendmail.el (sendmail-send-it): Don't parse Resent-* + headers. Always invoke sendmail with option -t. + 2001-03-21 Paul Eggert * international/mule-cmds.el (set-locale-environment): Set diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 8b011159d0b..39f641ea32d 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -795,7 +795,7 @@ external program defined by `sendmail-program'." (coding (and (local-variable-p 'buffer-file-coding-system) buffer-file-coding-system)) selected-coding - resend-to-addresses +;;; resend-to-addresses delimline fcc-was-found (mailbuf (current-buffer))) @@ -823,23 +823,23 @@ external program defined by `sendmail-program'." (replace-match "\n")) (goto-char (point-min)) (let ((case-fold-search t)) - (goto-char (point-min)) - (while (re-search-forward "^Resent-\\(to\\|cc\\|bcc\\):" delimline t) - (setq resend-to-addresses - (save-restriction - (narrow-to-region (point) - (save-excursion - (forward-line 1) - (while (looking-at "^[ \t]") - (forward-line 1)) - (point))) - (append (mail-parse-comma-list) - resend-to-addresses))) - ;; Delete Resent-BCC ourselves - (if (save-excursion (beginning-of-line) - (looking-at "resent-bcc")) - (delete-region (save-excursion (beginning-of-line) (point)) - (save-excursion (end-of-line) (1+ (point)))))) +;;; (goto-char (point-min)) +;;; (while (re-search-forward "^Resent-\\(to\\|cc\\|bcc\\):" delimline t) +;;; (setq resend-to-addresses +;;; (save-restriction +;;; (narrow-to-region (point) +;;; (save-excursion +;;; (forward-line 1) +;;; (while (looking-at "^[ \t]") +;;; (forward-line 1)) +;;; (point))) +;;; (append (mail-parse-comma-list) +;;; resend-to-addresses))) +;;; ;; Delete Resent-BCC ourselves +;;; (if (save-excursion (beginning-of-line) +;;; (looking-at "resent-bcc")) +;;; (delete-region (save-excursion (beginning-of-line) (point)) +;;; (save-excursion (end-of-line) (1+ (point)))))) ;;; Apparently this causes a duplicate Sender. ;;; ;; If the From is different than current user, insert Sender. ;;; (goto-char (point-min)) @@ -980,13 +980,16 @@ external program defined by `sendmail-program'." ;; These mean "report errors by mail" ;; and "deliver in background". '("-oem" "-odb")) - ;; Get the addresses from the message - ;; unless this is a resend. - ;; We must not do that for a resend - ;; because we would find the original addresses. - ;; For a resend, include the specific addresses. - (or resend-to-addresses - '("-t")))) +;;; ;; Get the addresses from the message +;;; ;; unless this is a resend. +;;; ;; We must not do that for a resend +;;; ;; because we would find the original addresses. +;;; ;; For a resend, include the specific addresses. +;;; (or resend-to-addresses + '("-t") +;;; ) + ) + ) (exit-value (apply 'call-process-region args))) (or (null exit-value) (zerop exit-value) (error "Sending...failed with exit value %d" exit-value))) -- 2.39.2