Mercurial > emacs
changeset 72635:e4183d5068ec
* 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.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 04 Sep 2006 14:17:12 +0000 |
| parents | 66b3ce03eb24 |
| children | cbdca6c6638d |
| files | lisp/ChangeLog lisp/mail/feedmail.el lisp/mail/sendmail.el lisp/paths.el |
| diffstat | 4 files changed, 28 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Sep 04 13:36:59 2006 +0000 +++ b/lisp/ChangeLog Mon Sep 04 14:17:12 2006 +0000 @@ -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
--- a/lisp/mail/feedmail.el Mon Sep 04 13:36:59 2006 +0000 +++ b/lisp/mail/feedmail.el Mon Sep 04 14:17:12 2006 +0000 @@ -1340,7 +1340,15 @@ (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)
--- a/lisp/mail/sendmail.el Mon Sep 04 13:36:59 2006 +0000 +++ b/lisp/mail/sendmail.el Mon Sep 04 14:17:12 2006 +0000 @@ -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.
--- a/lisp/paths.el Mon Sep 04 13:36:59 2006 +0000 +++ b/lisp/paths.el Mon Sep 04 14:17:12 2006 +0000 @@ -159,16 +159,6 @@ "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