mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-25 10:47:00 +00:00
Code Issues Releases Activity

(sendmail-send-it): Don't parse Resent-*

Browse Source 
headers.  Always invoke sendmail with option -t.
This commit is contained in:
Gerd Moellmann 2001-03-21 10:29:26 +00:00
parent 7008ccaca1
commit 180d550917
2 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2001-03-21 Gerd Moellmann <gerd@gnu.org>
* mail/sendmail.el (sendmail-send-it): Don't parse Resent-*
headers. Always invoke sendmail with option -t.
2001-03-21 Paul Eggert <eggert@twinsun.com>
* international/mule-cmds.el (set-locale-environment): Set

53
lisp/mail/sendmail.el
View File

@ -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)))