diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/mail/feedmail.el | 14 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ccfc6f6a405..3fa18d2480b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-05-13 Glenn Morris <rgm@gnu.org> + * mail/feedmail.el (feedmail-buffer-to-sendmail): Require sendmail. + * mail/sendmail.el (sendmail-program): Try executable-find first. (sendmail-send-it): sendmail-program cannot be unbound. diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index 597344fb88a..56936e88efe 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -1312,22 +1312,16 @@ Feeds the buffer to it." (mapconcat 'identity addr-listoid " ")))))) +(defvar sendmail-program) + (defun feedmail-buffer-to-sendmail (prepped errors-to addr-listoid) "Function which actually calls sendmail as a subprocess. Feeds the buffer to it. Probably has some flaws for Resent-* and other complicated cases." + (require 'sendmail) (set-buffer prepped) (apply 'call-process-region - (append (list (point-min) (point-max) - (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")) + (append (list (point-min) (point-max) sendmail-program nil errors-to nil "-oi" "-t") ;; provide envelope "from" to sendmail; results will vary (list "-f" user-mail-address) |