Commit 1a8e727b authored by Simon Josefsson's avatar Simon Josefsson
Browse files

(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).
parent eb1666e2
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.
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment