[Emacs-diffs] Changes to emacs/lisp/mail/smtpmail.el

[Simon Josefsson]

Index: emacs/lisp/mail/smtpmail.el
diff -c emacs/lisp/mail/smtpmail.el:1.42 emacs/lisp/mail/smtpmail.el:1.43
*** emacs/lisp/mail/smtpmail.el:1.42    Wed May  8 09:13:41 2002
--- emacs/lisp/mail/smtpmail.el Thu May  9 06:18:09 2002
***************
*** 167,173 ****
                       (string  :tag "Username")
                       (choice (const :tag "Query when needed" nil)
                                       (string  :tag "Password")))))
!   :version "21.3"
    :group 'smtpmail)
  
  (defcustom smtpmail-starttls-credentials '(("" 25 "" ""))
--- 167,173 ----
                       (string  :tag "Username")
                       (choice (const :tag "Query when needed" nil)
                                       (string  :tag "Password")))))
!   :version "21.4"
    :group 'smtpmail)
  
  (defcustom smtpmail-starttls-credentials '(("" 25 "" ""))
***************
*** 220,225 ****
--- 220,226 ----
        (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,266 ****
            ;; they put one in themselves.
            (goto-char (point-min))
            (if (not (re-search-forward "^From:" delimline t))
!               (let* ((login user-mail-address)
                       (fullname (user-full-name)))
                  (cond ((eq mail-from-style 'angles)
                         (insert "From: " fullname)
--- 261,267 ----
            ;; they put one in themselves.
            (goto-char (point-min))
            (if (not (re-search-forward "^From:" delimline t))
!               (let* ((login mail-address)
                       (fullname (user-full-name)))
                  (cond ((eq mail-from-style 'angles)
                         (insert "From: " fullname)
***************
*** 685,691 ****
  ;           (smtpmail-send-command process (format "MAIL FROM:address@hidden" 
(user-login-name) (smtpmail-fqdn)))
              (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s"
                                                     (or mail-envelope-from
!                                                        user-mail-address)
                                                     size-part
                                                     body-part))
  
--- 686,692 ----
  ;           (smtpmail-send-command process (format "MAIL FROM:address@hidden" 
(user-login-name) (smtpmail-fqdn)))
              (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s"
                                                     (or mail-envelope-from
!                                                        mail-address)
                                                     size-part
                                                     body-part))