mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Get the MAIL FROM from the From: header if no domain is configured

Browse source 
* mail/smtpmail.el (smtpmail-user-mail-address): New function.
(smtpmail-via-smtp): Use it, or fall back on the From address.
(smtpmail-send-it): Ditto.
This commit is contained in:
Lars Ingebrigtsen 2012-02-09 23:42:12 +01:00
parent f3934f6fef
commit 4c7e65bf4f
2 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2012-02-09 Lars Ingebrigtsen <larsi@rusty>
* mail/smtpmail.el (smtpmail-user-mail-address): New function.
(smtpmail-via-smtp): Use it, or fall back on the From address.
(smtpmail-send-it): Ditto.
2012-02-09 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/bytecomp.el (byte-compile-file-form-defvar):

28
lisp/mail/smtpmail.el
View file

@ -200,7 +200,10 @@ The list is in preference order.")
;; local binding in the mail buffer will take effect.
(smtpmail-mail-address
(or (and mail-specify-envelope-from (mail-envelope-from))
user-mail-address))
(smtpmail-user-mail-address)
(let ((from (mail-fetch-field "from")))
(and from
(cadr (mail-extract-address-components from))))))
(smtpmail-code-conv-from
(if enable-multibyte-characters
(let ((sendmail-coding-system smtpmail-code-conv-from))
@ -611,6 +614,15 @@ The list is in preference order.")
(unless smtpmail-smtp-server
(error "Couldn't contact an SMTP server"))))
(defun smtpmail-user-mail-address ()
"Return `user-mail-address' if it's a valid email address."
(and user-mail-address
(let ((parts (split-string user-mail-address "@")))
(and (= (length parts) 2)
;; There's a dot in the domain name.
(string-match "\\." (cadr parts))
user-mail-address))))
(defun smtpmail-via-smtp (recipient smtpmail-text-buffer
&optional ask-for-password)
(unless smtpmail-smtp-server
@ -621,10 +633,16 @@ The list is in preference order.")
(port smtpmail-smtp-service)
;; `smtpmail-mail-address' should be set to the appropriate
;; buffer-local value by the caller, but in case not:
(envelope-from (or smtpmail-mail-address
(and mail-specify-envelope-from
(mail-envelope-from))
user-mail-address))
(envelope-from
(or smtpmail-mail-address
(and mail-specify-envelope-from
(mail-envelope-from))
(smtpmail-user-mail-address)
;; Fall back on the From: header as the envelope From
;; address.
(let ((from (mail-fetch-field "from")))
(and from
(cadr (mail-extract-address-components from))))))
response-code
process-buffer
result