(sendmail-send-it):

If mail-from-style isn't angles, parens or nil, don't use -f option.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 967655e7a2d6730a977d3ccfa326db901748736f..b9e8853d00f15c5791e7e0212c3ca79d5dd6422c 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -846,10 +846,12 @@ the user from the mailer."
                                     nil errbuf nil "-oi")
                               ;; Always specify who from,
                               ;; since some systems have broken sendmails.
-                              (list "-f" (user-login-name))
-    ;;;                           ;; Don't say "from root" if running under su.
-    ;;;                           (and (equal (user-real-login-name) "root")
-    ;;;                                (list "-f" (user-login-name)))
+                              ;; unless user has said no.
+                              (if (memq mail-from-style '(angles parens nil))
+                                  (list "-f" (user-login-name)))
+;;;                           ;; Don't say "from root" if running under su.
+;;;                           (and (equal (user-real-login-name) "root")
+;;;                                (list "-f" (user-login-name)))
                               (and mail-alias-file
                                    (list (concat "-oA" mail-alias-file)))
                               (if mail-interactive