procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(smtpmail-mail-address): New variable.

Browse source 
(smtpmail-send-it): Bind and use that instead of `mail-address'.
(smtpmail-via-smtp): Likewise.
This commit is contained in:
Richard M. Stallman 2002-05-12 17:01:59 +00:00
parent ea9cc63168
commit 850ed7b3a7
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,5 +1,9 @@
2002-05-12 Richard M. Stallman <rms@gnu.org> 2002-05-12 Richard M. Stallman <rms@gnu.org>
* 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.el (ansi-color-get-face): Avoid add-to-list on local var.
(ansi-color-apply-sequence): Avoid duplicates in combined face list. (ansi-color-apply-sequence): Avoid duplicates in combined face list.

9
lisp/mail/smtpmail.el
View file

@ -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 ;;;###autoload
(defun smtpmail-send-it () (defun smtpmail-send-it ()
(let ((errbuf (if mail-interactive (let ((errbuf (if mail-interactive
@ -220,7 +223,7 @@ This is relative to `smtpmail-queue-dir'.")
(case-fold-search nil) (case-fold-search nil)
delimline delimline
(mailbuf (current-buffer)) (mailbuf (current-buffer))
(mail-address user-mail-address) (smtpmail-mail-address user-mail-address)
(smtpmail-code-conv-from (smtpmail-code-conv-from
(if enable-multibyte-characters (if enable-multibyte-characters
(let ((sendmail-coding-system smtpmail-code-conv-from)) (let ((sendmail-coding-system smtpmail-code-conv-from))
@ -261,7 +264,7 @@ This is relative to `smtpmail-queue-dir'.")
;; they put one in themselves. ;; they put one in themselves.
(goto-char (point-min)) (goto-char (point-min))
(if (not (re-search-forward "^From:" delimline t)) (if (not (re-search-forward "^From:" delimline t))
(let* ((login mail-address) (let* ((login smtpmail-mail-address)
(fullname (user-full-name))) (fullname (user-full-name)))
(cond ((eq mail-from-style 'angles) (cond ((eq mail-from-style 'angles)
(insert "From: " fullname) (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" (user-login-name) (smtpmail-fqdn)))
(smtpmail-send-command process (format "MAIL FROM: <%s>%s%s" (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s"
(or mail-envelope-from (or mail-envelope-from
mail-address) smtpmail-mail-address)
size-part size-part
body-part)) body-part))