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

[Richard M. Stallman]

Index: emacs/lisp/mail/sendmail.el
diff -c emacs/lisp/mail/sendmail.el:1.246 emacs/lisp/mail/sendmail.el:1.247
*** emacs/lisp/mail/sendmail.el:1.246   Fri Dec 28 07:17:37 2001
--- emacs/lisp/mail/sendmail.el Fri Dec 28 13:58:40 2001
***************
*** 81,88 ****
  If this is nil while `mail-specify-envelope-from' is non-nil, the
  content of `user-mail-address' is used."
    :version "21.1"
!   :type '(choice (const :tag "Use `user-mail-address'" nil)
!                string)
    :group 'sendmail)
  
  ;;;###autoload
--- 81,88 ----
  If this is nil while `mail-specify-envelope-from' is non-nil, the
  content of `user-mail-address' is used."
    :version "21.1"
!   :type '(choice (string :tag "From-name")
!                (const :tag "Use `user-mail-address'" nil))
    :group 'sendmail)
  
  ;;;###autoload
***************
*** 798,804 ****
        (program (if (boundp 'sendmail-program)
                     sendmail-program
                   "/usr/lib/sendmail"))
!       (mail-envelope-from mail-envelope-from))
      (unwind-protect
        (save-excursion
          (set-buffer tembuf)
--- 798,808 ----
        (program (if (boundp 'sendmail-program)
                     sendmail-program
                   "/usr/lib/sendmail"))
!       ;; Examine these variables now, so that
!       ;; local binding in the mail buffer will take effect.
!       (envelope-from
!        (and mail-specify-envelope-from
!             (or mail-envelope-from user-mail-address))))
      (unwind-protect
        (save-excursion
          (set-buffer tembuf)
***************
*** 964,972 ****
                      (append (list (point-min) (point-max)
                                    program
                                    nil errbuf nil "-oi")
!                             (and mail-specify-envelope-from
!                                  (list "-f" (or mail-envelope-from
!                                                 user-mail-address)))
  ;;;                         ;; Don't say "from root" if running under su.
  ;;;                         (and (equal (user-real-login-name) "root")
  ;;;                              (list "-f" (user-login-name)))
--- 968,975 ----
                      (append (list (point-min) (point-max)
                                    program
                                    nil errbuf nil "-oi")
!                             (and envelope-from
!                                  (list "-f" envelope-from))
  ;;;                         ;; Don't say "from root" if running under su.
  ;;;                         (and (equal (user-real-login-name) "root")
  ;;;                              (list "-f" (user-login-name)))