# HG changeset patch
# User Simon Josefsson <jas@extundo.com>
# Date 1020939489 0
# Node ID a025c8bb9569356232d6e2a7680578bbde8d8458
# Parent  c9d37a07c5a42bc589294ea7f84ca1519c8189ec
(smtpmail-send-it): Use user-mail-address from
calling buffer.
(smtpmail-auth-credentials): Bump :version to 21.4 (21.3 will not
have the patch).

diff -r c9d37a07c5a4 -r a025c8bb9569 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu May 09 01:51:16 2002 +0000
+++ b/lisp/ChangeLog	Thu May 09 10:18:09 2002 +0000
@@ -1,3 +1,10 @@
+2002-05-07  Simon Josefsson  <jas@extundo.com>
+
+	* mail/smtpmail.el (smtpmail-send-it): Use user-mail-address from
+	calling buffer.
+	(smtpmail-auth-credentials): Bump :version to 21.4 (21.3 will not
+	have the patch).
+
 2002-05-09  Kim F. Storm  <storm@cua.dk>
 
 	* wid-edit.el (checkbox): New check-mark image.
diff -r c9d37a07c5a4 -r a025c8bb9569 lisp/mail/smtpmail.el
--- a/lisp/mail/smtpmail.el	Thu May 09 01:51:16 2002 +0000
+++ b/lisp/mail/smtpmail.el	Thu May 09 10:18:09 2002 +0000
@@ -167,7 +167,7 @@
 		       (string  :tag "Username")
 		       (choice (const :tag "Query when needed" nil)
 				       (string  :tag "Password")))))
-  :version "21.3"
+  :version "21.4"
   :group 'smtpmail)
 
 (defcustom smtpmail-starttls-credentials '(("" 25 "" ""))
@@ -220,6 +220,7 @@
 	(case-fold-search nil)
 	delimline
 	(mailbuf (current-buffer))
+	(mail-address user-mail-address)
 	(smtpmail-code-conv-from
 	 (if enable-multibyte-characters
 	     (let ((sendmail-coding-system smtpmail-code-conv-from))
@@ -260,7 +261,7 @@
 	    ;; they put one in themselves.
 	    (goto-char (point-min))
 	    (if (not (re-search-forward "^From:" delimline t))
-		(let* ((login user-mail-address)
+		(let* ((login mail-address)
 		       (fullname (user-full-name)))
 		  (cond ((eq mail-from-style 'angles)
 			 (insert "From: " fullname)
@@ -685,7 +686,7 @@
 ;	      (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 mail-envelope-from
-							 user-mail-address)
+							 mail-address)
 						     size-part
 						     body-part))