(sendmail-send-it): Added support for Resent-CC and

Resent-BCC headers.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index a6dbc481ae589867b6696c452c9387261d445920..f7b1d82e61ab8a79508b2d4243f3aec459c710af 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -493,7 +493,7 @@ the user from the mailer."
            (replace-match "\n"))
          (let ((case-fold-search t))
            (goto-char (point-min))
-           (while (re-search-forward "^Resent-to:" delimline t)
+           (while (re-search-forward "^Resent-\\(to\\|cc\\|bcc\\):" delimline t)
              (setq resend-to-addresses
                    (save-restriction
                      (narrow-to-region (point)
@@ -501,7 +501,12 @@ the user from the mailer."
                                          (end-of-line)
                                          (point)))
                      (append (mail-parse-comma-list)
-                             resend-to-addresses))))
+                             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))