diff options
author | Richard M. Stallman <[email protected]> | 2002-05-12 17:01:59 +0000 |
---|---|---|
committer | Richard M. Stallman <[email protected]> | 2002-05-12 17:01:59 +0000 |
commit | 850ed7b3a74cedcc4dea43f92a934080de42ee92 (patch) | |
tree | a5e2eb91b92a022b528faa8429ca4a93c3ef1f47 /lisp | |
parent | ea9cc6316844c71b2ebfff07def3263895598533 (diff) |
(smtpmail-mail-address): New variable.
(smtpmail-send-it): Bind and use that instead of `mail-address'.
(smtpmail-via-smtp): Likewise.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 4 | ||||
-rw-r--r-- | lisp/mail/smtpmail.el | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0e1985fb8a..a5353cfcf6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2002-05-12 Richard M. Stallman <[email protected]> + * mail/smtpmail.el (smtpmail-mail-address): New variable. + (smtpmail-send-it): Bind and use that instead of `mail-address'. + (smtpmail-via-smtp): Likewise. + * ansi-color.el (ansi-color-get-face): Avoid add-to-list on local var. (ansi-color-apply-sequence): Avoid duplicates in combined face list. diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 59bbd7fbc8..f43c5f1785 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -211,6 +211,9 @@ This is relative to `smtpmail-queue-dir'.") ;;; ;;; +(defvar smtpmail-mail-address nil + "Value of `user-mail-address' in ambient buffer.") + ;;;###autoload (defun smtpmail-send-it () (let ((errbuf (if mail-interactive @@ -220,7 +223,7 @@ This is relative to `smtpmail-queue-dir'.") (case-fold-search nil) delimline (mailbuf (current-buffer)) - (mail-address user-mail-address) + (smtpmail-mail-address user-mail-address) (smtpmail-code-conv-from (if enable-multibyte-characters (let ((sendmail-coding-system smtpmail-code-conv-from)) @@ -261,7 +264,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 mail-address) + (let* ((login smtpmail-mail-address) (fullname (user-full-name))) (cond ((eq mail-from-style 'angles) (insert "From: " fullname) @@ -686,7 +689,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 - mail-address) + smtpmail-mail-address) size-part body-part)) |