1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00

sendmail.el trivia.

* lisp/mail/sendmail.el (sendmail-program): Try executable-find first.
(sendmail-send-it): sendmail-program cannot be unbound.
This commit is contained in:
Glenn Morris 2011-05-12 18:42:24 -07:00
parent a54640143d
commit 8340026cae
2 changed files with 11 additions and 9 deletions

View File

@ -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.

View File

@ -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))