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

[Richard M. Stallman]

Index: emacs/lisp/mail/smtpmail.el
diff -c emacs/lisp/mail/smtpmail.el:1.43 emacs/lisp/mail/smtpmail.el:1.44
*** emacs/lisp/mail/smtpmail.el:1.43    Thu May  9 06:18:09 2002
--- emacs/lisp/mail/smtpmail.el Sun May 12 13:00:52 2002
***************
*** 211,216 ****
--- 211,219 ----
  ;;;
  ;;;
  
+ (defvar smtpmail-mail-address nil
+   "Value of `user-mail-address' in ambient buffer.")
+ 
  ;;;###autoload
  (defun smtpmail-send-it ()
    (let ((errbuf (if mail-interactive
***************
*** 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))
--- 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))
***************
*** 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)
--- 264,270 ----
            ;; they put one in themselves.
            (goto-char (point-min))
            (if (not (re-search-forward "^From:" delimline t))
!               (let* ((login smtpmail-mail-address)
                       (fullname (user-full-name)))
                  (cond ((eq mail-from-style 'angles)
                         (insert "From: " fullname)
***************
*** 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))
  
--- 689,695 ----
  ;           (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
!                                                        smtpmail-mail-address)
                                                     size-part
                                                     body-part))