summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1998-05-28 03:49:04 +0000
committerRichard M. Stallman <rms@gnu.org>1998-05-28 03:49:04 +0000
commit13da0554f62a88f309b1b79f688b1468420487a4 (patch)
tree36475c0af13f0a50dbd520d8f60180a7a646c02b /lisp
parentfb597fe85a4c5212f54f97124c83b6af30d5d722 (diff)
downloademacs-13da0554f62a88f309b1b79f688b1468420487a4.tar.gz
(sendmail-send-it):
If mail-from-style isn't angles, parens or nil, don't use -f option.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/mail/sendmail.el10
1 files changed, 6 insertions, 4 deletions
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