diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-19 00:00:21 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-19 00:00:21 +0000 |
| commit | 9c8020a8df03dc67a56d7df15664dcf7ace54bf0 (patch) | |
| tree | 09b0646addff3c39f9e96ba89c04bdcc038a87a7 /lisp/mail/sendmail.el | |
| parent | dfc3268dfa133a2e0a677f1af7c1ee548eae065d (diff) | |
| parent | bd3164743080f3eb5fc316aca7cc5322ca58fe33 (diff) | |
| download | emacs-9c8020a8df03dc67a56d7df15664dcf7ace54bf0.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 890-898)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 122-128)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 257-258)
- Merge from emacs--rel--22
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-270
Diffstat (limited to 'lisp/mail/sendmail.el')
| -rw-r--r-- | lisp/mail/sendmail.el | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 34a0aa0ad82..e8d896be246 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -991,6 +991,19 @@ See also the function `select-message-coding-system'.") nil) (t (error "Invalid value for `mail-from-style'"))))) +;; Normally you will not need to modify these options unless you are +;; using some non-genuine substitute for sendmail which does not +;; implement each and every option that the original supports. +;; E.g., ssmtp does not support "-odb", so, if your site uses it, +;; you will need to modify `sendmail-error-reporting-non-interactive' +;; in your site-init.el. +(defvar sendmail-error-reporting-interactive + ;; These mean "report errors to terminal" and "deliver interactively" + '("-oep" "-odi")) +(defvar sendmail-error-reporting-non-interactive + ;; These mean "report errors by mail" and "deliver in background". + '("-oem" "-odb")) + (defun sendmail-send-it () "Send the current mail buffer using the Sendmail package. This is a suitable value for `send-mail-function'. It sends using the @@ -1135,12 +1148,8 @@ external program defined by `sendmail-program'." (and mail-alias-file (list (concat "-oA" mail-alias-file))) (if mail-interactive - ;; These mean "report errors to terminal" - ;; and "deliver interactively" - '("-oep" "-odi") - ;; These mean "report errors by mail" - ;; and "deliver in background". - '("-oem" "-odb")) + sendmail-error-reporting-interactive + sendmail-error-reporting-non-interactive) ;; Get the addresses from the message ;; unless this is a resend. ;; We must not do that for a resend |