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

[Glenn Morris]

Index: emacs/lisp/mail/smtpmail.el
diff -c emacs/lisp/mail/smtpmail.el:1.57 emacs/lisp/mail/smtpmail.el:1.58
*** emacs/lisp/mail/smtpmail.el:1.57    Sun Jul 13 13:20:34 2003
--- emacs/lisp/mail/smtpmail.el Sun Aug 24 11:23:12 2003
***************
*** 212,218 ****
  ;;;
  
  (defvar smtpmail-mail-address nil
!   "Value of `user-mail-address' in ambient buffer.")
  
  ;;;###autoload
  (defun smtpmail-send-it ()
--- 212,218 ----
  ;;;
  
  (defvar smtpmail-mail-address nil
!   "Value to use for envelope-from address for mail from ambient buffer.")
  
  ;;;###autoload
  (defun smtpmail-send-it ()
***************
*** 223,229 ****
        (case-fold-search nil)
        delimline
        (mailbuf (current-buffer))
!       (smtpmail-mail-address user-mail-address)
        (smtpmail-code-conv-from
         (if enable-multibyte-characters
             (let ((sendmail-coding-system smtpmail-code-conv-from))
--- 223,231 ----
        (case-fold-search nil)
        delimline
        (mailbuf (current-buffer))
!       (smtpmail-mail-address
!          (or (and mail-specify-envelope-from (mail-envelope-from))
!              user-mail-address))
        (smtpmail-code-conv-from
         (if enable-multibyte-characters
             (let ((sendmail-coding-system smtpmail-code-conv-from))
***************
*** 545,553 ****
        (host (or smtpmail-smtp-server
                  (error "`smtpmail-smtp-server' not defined")))
        (port smtpmail-smtp-service)
-       (envelope-from (or (mail-envelope-from)
-                          smtpmail-mail-address
-                          user-mail-address))
        response-code
        greeting
        process-buffer
--- 547,552 ----
***************
*** 697,703 ****
                     "")))
  ;           (smtpmail-send-command process (format "MAIL FROM:address@hidden" 
(user-login-name) (smtpmail-fqdn)))
              (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s"
!                                                    envelope-from
                                                     size-part
                                                     body-part))
  
--- 696,702 ----
                     "")))
  ;           (smtpmail-send-command process (format "MAIL FROM:address@hidden" 
(user-login-name) (smtpmail-fqdn)))
              (smtpmail-send-command process (format "MAIL FROM: <%s>%s%s"
!                                                      smtpmail-mail-address
                                                     size-part
                                                     body-part))