message.el (message-send-mail-with-sendmail): Assume sendmail-program is bound, since...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3968e80..ae4bfad 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-13  Glenn Morris  <rgm@gnu.org>
+
+       * message.el (message-send-mail-with-sendmail): Assume sendmail-program
+       is bound, since this function requires sendmail.
+
 2011-05-11  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * registry.el (registry-usage-test): Disable pruning test.

diff --git a/lisp/message.el b/lisp/message.el
index b26de63..d1457c5 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4665,6 +4665,8 @@ If you always want Gnus to send messages in one piece, set
     (set-buffer mailbuf)
     (push 'mail message-sent-message-via)))
 
+(defvar sendmail-program)
+
 (defun message-send-mail-with-sendmail ()
   "Send off the prepared buffer with sendmail."
   (require 'sendmail)
@@ -4700,16 +4702,7 @@ If you always want Gnus to send messages in one piece, set
                 (cpr (apply
                       'call-process-region
                       (append
-                       (list (point-min) (point-max)
-                             (cond ((boundp 'sendmail-program)
-                                    sendmail-program)
-                                   ((file-exists-p "/usr/sbin/sendmail")
-                                    "/usr/sbin/sendmail")
-                                   ((file-exists-p "/usr/lib/sendmail")
-                                    "/usr/lib/sendmail")
-                                   ((file-exists-p "/usr/ucblib/sendmail")
-                                    "/usr/ucblib/sendmail")
-                                   (t "fakemail"))
+                       (list (point-min) (point-max) sendmail-program
                              nil errbuf nil "-oi")
                        message-sendmail-extra-arguments
                        ;; Always specify who from,