changeset 48846:2b2dc043271d

(smtpmail-via-smtp): Fall back to user-mail-address as sender.
author Simon Josefsson <jas@extundo.com>
date Sun, 15 Dec 2002 07:23:36 +0000
parents a1bf73b831bc
children 49b559ee7ba4
files lisp/mail/smtpmail.el
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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))