sendmail.el trivia.

* lisp/mail/sendmail.el (sendmail-program): Try executable-find first.
(sendmail-send-it): sendmail-program cannot be unbound.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 004be53a3b275d35edb6b9884d8235ac673ee8d2..ccfc6f6a405603a5d657c43f93ba6330331cef0b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-13  Glenn Morris  <rgm@gnu.org>
 
+       * mail/sendmail.el (sendmail-program): Try executable-find first.
+       (sendmail-send-it): sendmail-program cannot be unbound.
+
        * calendar/appt.el (appt-make-list): Simplify.
        (appt-time-msg-list): Doc fix.
        (appt-check): Change mode-line message at the time of the appointment.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 069ad9662a26f708238184869ca82a70a018b830..ed4270d484cfad90fd7646a79402a05e25a05808 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -43,12 +43,14 @@
   :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.
+  (or (executable-find "sendmail")
+      (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 lib-src, to interface to /bin/mail
   "Program used to send messages."
+  :version "24.1"                      ; added executable-find
   :group 'mail
   :type 'file)
 
@@ -1037,9 +1039,6 @@ external program defined by `sendmail-program'."
        delimline
        fcc-was-found
        (mailbuf (current-buffer))
-       (program (if (boundp 'sendmail-program)
-                    sendmail-program
-                  "/usr/lib/sendmail"))
        ;; Examine these variables now, so that
        ;; local binding in the mail buffer will take effect.
        (envelope-from
@@ -1165,7 +1164,7 @@ external program defined by `sendmail-program'."
                     (coding-system-for-write selected-coding)
                     (args
                      (append (list (point-min) (point-max)
-                                   program
+                                   sendmail-program
                                    nil errbuf nil "-oi")
                              (and envelope-from
                                   (list "-f" envelope-from))