* mail/feedmail.el (feedmail-buffer-to-sendmail): Look for

	sendmail in several common directories.

	* mail/sendmail.el (sendmail-program): Moved here from pathe.el.

	* paths.el (sendmail-program): Removed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9013d010f62f770430699b7a4f90dc046b0a8d4a..ac654f66234fee50d4511a3ce2143b8db19736d3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-04  Chong Yidong  <cyd@stupidchicken.com>
+
+       * mail/feedmail.el (feedmail-buffer-to-sendmail): Look for
+       sendmail in several common directories.
+
+       * mail/sendmail.el (sendmail-program): Moved here from pathe.el.
+
+       * paths.el (sendmail-program): Removed.
+
 2006-09-04  Daiki Ueno  <ueno@unixuser.org>
 
        * pgg-gpg.el (pgg-gpg-process-region): Revert two patches from Satyaki

diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 3bd287541cf89f045aea58d6392d36b6a4e791e7..04928fb537b3195b410053cae69d047a5ea85775 100644 (file)
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -1340,7 +1340,15 @@ complicated cases."
   (set-buffer prepped)
   (apply 'call-process-region
         (append (list (point-min) (point-max)
-                      (if (boundp 'sendmail-program) sendmail-program "/usr/lib/sendmail")
+                      (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"))
                       nil errors-to nil "-oi" "-t")
                 ;; provide envelope "from" to sendmail; results will vary
                 (list "-f" user-mail-address)

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 28463208c45ba429d770ac11c1340c25eddd0abf..288e5bd0df375d0dcee887c0aaf5ce9e584c5835 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -48,6 +48,16 @@
   :group 'sendmail
   :version "22.1")
 
+(defcustom sendmail-program
+  (cond
+    ((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"))                    ;In ../etc, to interface to /bin/mail.
+  "Program used to send messages."
+  :group 'mail
+  :type 'file)
+
 ;;;###autoload
 (defcustom mail-from-style 'angles
   "Specifies how \"From:\" fields look.

diff --git a/lisp/paths.el b/lisp/paths.el
index 846f91793d146f7690236e5cc543094cfcba3e85..022f12dd1fc18458891077833945809e243564be 100644 (file)
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -159,16 +159,6 @@ The `ORGANIZATION' environment variable is used instead if defined.")
   "Name of directory used by system mailer for delivering new mail.
 Its name should end with a slash.")
 
-(defcustom sendmail-program
-  (cond
-    ((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"))                    ;In ../etc, to interface to /bin/mail.
-  "Program used to send messages."
-  :group 'mail
-  :type 'file)
-
 (defcustom remote-shell-program
   (cond
    ;; Some systems use rsh for the remote shell; others use that name for the