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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4bfdca03b8282fdb7b399773db4e5bb475fa677..96fb9b32fabbf63036372d9d90beee237fc9a636 100644 (file)
--- 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 f57d08707e35ab9b970628ff311d9d2c4c868782..50ff26f6f7e750e1f03f7394b581708d98cae1fc 100644 (file)
--- 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))