From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 18 Oct 2001 20:48:23 +0000 (+0000)
Subject: (smtpmail-via-smtp): Use mail-envelope-from if set.
X-Git-Tag: ttn-vms-21-2-B4~19367
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d2f11dda2a402698c823cca897ba3edb06f29643;p=emacs.git

(smtpmail-via-smtp): Use mail-envelope-from if set.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4bfdca03b8..96fb9b32fab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2001-10-18  Stefan Monnier  <monnier@cs.yale.edu>
 
+	* mail/smtpmail.el (smtpmail-via-smtp): Use mail-envelope-from if set.
+
 	* xml.el (xml-parse-tag): Use eq on char-after's return value.
 
 2001-10-18  Gerd Moellmann  <gerd@gnu.org>
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index f57d08707e3..50ff26f6f7e 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -468,7 +468,8 @@ This is relative to `smtpmail-queue-dir'.")
 		     "")))
 ;	      (smtpmail-send-command process (format "MAIL FROM:%s@%s" (user-login-name) (smtpmail-fqdn)))
 	      (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s"
-						     user-mail-address
+						     (or mail-envelope-from
+							 user-mail-address)
 						     size-part
 						     body-part))