From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 4 Jul 2001 09:54:15 +0000 (+0000)
Subject: (sendmail-send-it): Look at `sendmail-program'
X-Git-Tag: emacs-pretest-21.0.104~75
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ff0518e6ab942538216392ecf58196f854b3ed0;p=emacs.git

(sendmail-send-it): Look at `sendmail-program'
in caller buffer.
---

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 39f641ea32d..f354ddb59c5 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -798,7 +798,11 @@ external program defined by `sendmail-program'."
 ;;;	resend-to-addresses
 	delimline
 	fcc-was-found
-	(mailbuf (current-buffer)))
+	(mailbuf (current-buffer))
+	(program (if (boundp 'sendmail-program)
+		     sendmail-program
+		   "/usr/lib/sendmail"))
+	(originator user-mail-address))
     (unwind-protect
 	(save-excursion
 	  (set-buffer tembuf)
@@ -962,12 +966,10 @@ external program defined by `sendmail-program'."
 			  (select-message-coding-system)))
 		     (args 
 		      (append (list (point-min) (point-max)
-				    (if (boundp 'sendmail-program)
-					sendmail-program
-				      "/usr/lib/sendmail")
+				    program
 				    nil errbuf nil "-oi")
 			      (and mail-specify-envelope-from 
-				   (list "-f" user-mail-address))
+				   (list "-f" originator))
 ;;; 			      ;; Don't say "from root" if running under su.
 ;;; 			      (and (equal (user-real-login-name) "root")
 ;;; 				   (list "-f" (user-login-name)))