# HG changeset patch
# User Simon Josefsson <jas@extundo.com>
# Date 1039937016 0
# Node ID 2b2dc043271d6160129aec5e1d3a10e126378879
# Parent  a1bf73b831bc7da7d4a27e25fd297e0310b0b998
(smtpmail-via-smtp): Fall back to user-mail-address as sender.

diff -r a1bf73b831bc -r 2b2dc043271d lisp/mail/smtpmail.el
--- a/lisp/mail/smtpmail.el	Sat Dec 14 23:35:19 2002 +0000
+++ b/lisp/mail/smtpmail.el	Sun Dec 15 07:23:36 2002 +0000
@@ -541,7 +541,9 @@
 	(host (or smtpmail-smtp-server
 		  (error "`smtpmail-smtp-server' not defined")))
 	(port smtpmail-smtp-service)
-	(envelope-from (mail-envelope-from))
+	(envelope-from (or (mail-envelope-from)
+			   smtpmail-mail-address
+			   user-mail-address))
 	response-code
 	greeting
 	process-buffer
@@ -691,11 +693,10 @@
 		     "")))
 ;	      (smtpmail-send-command process (format "MAIL FROM:%s@%s" (user-login-name) (smtpmail-fqdn)))
 	      (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s"
-						     (or envelope-from
-							 smtpmail-mail-address)
+						     envelope-from
 						     size-part
 						     body-part))
-
+	      
 	      (if (or (null (car (setq response-code (smtpmail-read-response process))))
 		      (not (integerp (car response-code)))
 		      (>= (car response-code) 400))