From 82695714e8bf5c42f771dcb3e379944647012331 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 4 Sep 2006 14:17:12 +0000 Subject: [PATCH] * 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. --- lisp/ChangeLog | 9 +++++++++ lisp/mail/feedmail.el | 10 +++++++++- lisp/mail/sendmail.el | 10 ++++++++++ lisp/paths.el | 10 ---------- 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9013d010f62..ac654f66234 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2006-09-04 Chong Yidong + + * 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 * 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 3bd287541cf..04928fb537b 100644 --- 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 28463208c45..288e5bd0df3 100644 --- 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 846f91793d1..022f12dd1fc 100644 --- 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 -- 2.39.2