# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1009541857 0
# Node ID fd0376bcb50717211fb02040b9c36140dd9b56eb
# Parent  8c74ef3ab03f460da4b6478f43d13a39ee2da695
(mail-envelope-from): Fix :type.  Suggested by "Golubev I. N." <gin@mo.msk.ru>.
(sendmail-send-it): Copy `mail-envelope-from' from calling buffer.
From "Golubev I. N." <gin@mo.msk.ru>.

diff -r 8c74ef3ab03f -r fd0376bcb507 lisp/mail/sendmail.el
--- a/lisp/mail/sendmail.el	Fri Dec 28 06:29:37 2001 +0000
+++ b/lisp/mail/sendmail.el	Fri Dec 28 12:17:37 2001 +0000
@@ -81,7 +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 'boolean
+  :type '(choice (const :tag "Use `user-mail-address'" nil)
+		 string)
   :group 'sendmail)
 
 ;;;###autoload
@@ -796,7 +797,8 @@
 	(mailbuf (current-buffer))
 	(program (if (boundp 'sendmail-program)
 		     sendmail-program
-		   "/usr/lib/sendmail")))
+		   "/usr/lib/sendmail"))
+	(mail-envelope-from mail-envelope-from))
     (unwind-protect
 	(save-excursion
 	  (set-buffer tembuf)