(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.

2 files changed, 23 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a495218555..a9d6c2b29a6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 2a986a33f72..baf99cfd54a 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