[Emacs-diffs] /srv/bzr/emacs/trunk r104213: * lisp/mail/feedmail.el (feedmail-buffer-to-sendmail): Require sendmail.

[Glenn Morris]

------------------------------------------------------------
revno: 104213
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-05-12 19:06:35 -0700
message:
  * lisp/mail/feedmail.el (feedmail-buffer-to-sendmail): Require sendmail.
modified:
  lisp/ChangeLog
  lisp/mail/feedmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-13 01:42:24 +0000
+++ b/lisp/ChangeLog    2011-05-13 02:06:35 +0000
@@ -1,5 +1,7 @@
 2011-05-13  Glenn Morris  <address@hidden>
 
+       * mail/feedmail.el (feedmail-buffer-to-sendmail): Require sendmail.
+
        * mail/sendmail.el (sendmail-program): Try executable-find first.
        (sendmail-send-it): sendmail-program cannot be unbound.
 

=== modified file 'lisp/mail/feedmail.el'
--- a/lisp/mail/feedmail.el     2011-01-15 23:16:57 +0000
+++ b/lisp/mail/feedmail.el     2011-05-13 02:06:35 +0000
@@ -1312,22 +1312,16 @@
                         (mapconcat 'identity addr-listoid " "))))))
 
 
+(defvar sendmail-program)
+
 (defun feedmail-buffer-to-sendmail (prepped errors-to addr-listoid)
   "Function which actually calls sendmail as a subprocess.
 Feeds the buffer to it.  Probably has some flaws for Resent-* and other
 complicated cases."
+  (require 'sendmail)
   (set-buffer prepped)
   (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"))
+        (append (list (point-min) (point-max) sendmail-program
                       nil errors-to nil "-oi" "-t")
                 ;; provide envelope "from" to sendmail; results will vary
                 (list "-f" user-mail-address)