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

* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0de2c88ac48d0110ce4ce55bb62586daa51f27c..0769badf4f53c488e28e1b8dcf3eec675e90ce88 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index e3051fd0c9fcd812efa76a9cdac34a2d59c155a8..99283bebf9def5e7d4fc97b559f60ed0587fb519 100644 (file)
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -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