Mercurial > emacs
changeset 85316:a1fff6d65046
(sendmail-error-reporting-interactive)
(sendmail-error-reporting-non-interactive): New variables for sendmail
error reporting options to simplify support for imperfect sendmail emulators.
(sendmail-send-it): Use them instead of list literals.
| author | Sam Steingold <sds@gnu.org> |
|---|---|
| date | Mon, 15 Oct 2007 14:38:42 +0000 |
| parents | 3e6a7464c2b1 |
| children | e55429fe2239 |
| files | lisp/ChangeLog lisp/mail/sendmail.el |
| diffstat | 2 files changed, 23 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Oct 15 14:21:23 2007 +0000 +++ b/lisp/ChangeLog Mon Oct 15 14:38:42 2007 +0000 @@ -1,3 +1,11 @@ +2007-10-15 Sam Steingold <sds@gnu.org> + + * mail/sendmail.el (sendmail-error-reporting-interactive) + (sendmail-error-reporting-non-interactive): New variables for + sendmail error reporting options to simplify support for imperfect + sendmail emulators. + (sendmail-send-it): Use them instead of list literals. + 2007-10-15 Juanma Barranquero <lekktu@gmail.com> * help-fns.el: Revert previous change; it creates a
--- a/lisp/mail/sendmail.el Mon Oct 15 14:21:23 2007 +0000 +++ b/lisp/mail/sendmail.el Mon Oct 15 14:38:42 2007 +0000 @@ -991,6 +991,19 @@ 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 @@ (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