(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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 13128b488bfc0ebe09ef63a8ab17689211563c14..ba2aa932259ab745156ab82cfeabe50627560aba 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index f71e7bca6b83e07aee7b4057dc33a77a43d7af75..59bbd7fbc893fbf2dfe718b710daa2184eb6bb06 100644 (file)
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -167,7 +167,7 @@ looks like `user@realm'."
                       (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 @@ This is relative to `smtpmail-queue-dir'.")
        (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 @@ This is relative to `smtpmail-queue-dir'.")
            ;; 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 @@ 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"
                                                     (or mail-envelope-from
-                                                        user-mail-address)
+                                                        mail-address)
                                                     size-part
                                                     body-part))