(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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6a9879cd275e24b20b5fd8508593108ed7be36ca..a14b2d20dd1539277d7f04d50833b5092fed6777 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-28  Simon Josefsson  <jas@extundo.com>
+
+       * mail/sendmail.el (mail-envelope-from): Fix :type.
+       (sendmail-send-it): Copy `mail-envelope-from' from calling buffer.
+
 2001-12-28  Richard M. Stallman  <rms@gnu.org>
 
        * net/ldap.el (ldap-search-internal): Handle <file://...> in results.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index c7a2edc4ec97fb8a1bdfbd4d0a674a4f69603d17..614732811f8605989699160f57794a81bbf0c1bf 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -81,7 +81,8 @@ is a privileged operation."
 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
@@ -805,7 +806,8 @@ external program defined by `sendmail-program'."
        (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)