From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 28 May 1998 03:49:04 +0000 (+0000)
Subject: (sendmail-send-it):
X-Git-Tag: emacs-20.3~804
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=13da0554f62a88f309b1b79f688b1468420487a4;p=emacs.git

(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 967655e7a2d..b9e8853d00f 100644
--- 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