Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 421-422, 424)

   - Merge from gnus--rel--5.10
   - Update from CVS

 * gnus--rel--5.10  (patch 130-134)

   - Update from CVS
   - Merge from emacs--devo--0

2006-09-04  Chong Yidong  <cyd@stupidchicken.com>

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

2006-09-04  Chong Yidong  <cyd@stupidchicken.com>

   * lisp/message.el (message-send-mail-with-sendmail): Look for sendmail in
   several common directories.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-195

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 6646fc2..b1bc212 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-04  Chong Yidong  <cyd@stupidchicken.com>
+
+       * sendmail.el (sendmail-program): Moved here from pathe.el.
+
 2006-08-09  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * compface.el (uncompface): Use binary rather than raw-text-unix.

diff --git a/contrib/sendmail.el b/contrib/sendmail.el
index 2846320..288e5bd 100644 (file)
--- a/contrib/sendmail.el
+++ b/contrib/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/ChangeLog b/lisp/ChangeLog
index 1750a16..c883d6c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-04  Chong Yidong  <cyd@stupidchicken.com>
+
+       * message.el (message-send-mail-with-sendmail): Look for sendmail in
+       several common directories.
+
 2006-09-05  Daiki Ueno  <ueno@unixuser.org>
 
        * mml2015.el (mml2015-epg-encrypt): Expand group configuration.

diff --git a/lisp/message.el b/lisp/message.el
index 8ace090..a3a38b3 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4180,9 +4180,15 @@ If you always want Gnus to send messages in one piece, set
                       '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 errbuf nil "-oi")
                        ;; Always specify who from,
                        ;; since some systems have broken sendmails.