Mercurial > emacs
changeset 42383:4d7337b920e3
(mail-envelope-from): Fix custom type.
(sendmail-send-it): Check mail-specify-envelope-from
and mail-envelope-from in the mail buffer at start.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Fri, 28 Dec 2001 18:58:40 +0000 |
| parents | 3f0abda6556d |
| children | e4835ecdffbc |
| files | lisp/mail/sendmail.el |
| diffstat | 1 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mail/sendmail.el Fri Dec 28 18:49:02 2001 +0000 +++ b/lisp/mail/sendmail.el Fri Dec 28 18:58:40 2001 +0000 @@ -81,8 +81,8 @@ 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) + :type '(choice (string :tag "From-name") + (const :tag "Use `user-mail-address'" nil)) :group 'sendmail) ;;;###autoload @@ -798,7 +798,11 @@ (program (if (boundp 'sendmail-program) sendmail-program "/usr/lib/sendmail")) - (mail-envelope-from mail-envelope-from)) + ;; 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,9 +968,8 @@ (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))) + (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)))