diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/mail/feedmail.el | 16 | ||||
| -rw-r--r-- | lisp/mail/sendmail.el | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fa61c6913c2..e7c835400ad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-05-18 Glenn Morris <rgm@gnu.org> + * mail/sendmail.el (sendmail-program): Fall back to just "sendmail". + Rationalize calendar handling of day and month abbrev-arrays. * calendar/calendar.el (calendar-customized-p): New function. (calendar-abbrev-construct, calendar-make-alist): Change what it does. diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index 3ef8a6c4955..b86bdb178f6 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -13,9 +13,8 @@ ;; A replacement for parts of Emacs' sendmail.el (specifically, ;; it's what handles your outgoing mail after you hit C-c C-c in mail ;; mode). See below for a list of additional features, including the -;; ability to queue messages for later sending. If you are using -;; fakemail as a subprocess, you can switch to feedmail and eliminate -;; the use of fakemail. +;; ability to queue messages for later sending. This replaces +;; the standalone fakemail program that used to be distributed with Emacs. ;; feedmail works with recent versions of Emacs (20.x series) and ;; XEmacs (tested with 20.4 and later betas). It probably no longer @@ -90,12 +89,11 @@ ;; This code does in elisp a superset of the stuff that used to be done ;; by the separate program "fakemail" for processing outbound email. ;; In other words, it takes over after you hit "C-c C-c" in mail mode. -;; By appropriate setting of options, you can still use "fakemail", -;; or you can even revert to sendmail (which is not too popular -;; locally). See the variables at the top of the elisp for how to -;; achieve these effects (there are more features than in this bullet -;; list, so trolling through the variable and function doc strings may -;; be worth your while): +;; By appropriate setting of options, you can even revert to sendmail +;; (which is not too popular locally). See the variables at the top +;; of the elisp for how to achieve these effects (there are more +;; features than in this bullet list, so trolling through the variable +;; and function doc strings may be worth your while): ;; ;; --- you can park outgoing messages into a disk-based queue and ;; stimulate sending them all later (handy for laptop users); diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index ed4270d484c..bbb02d7b978 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -48,9 +48,9 @@ ((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 + (t "sendmail"))) "Program used to send messages." - :version "24.1" ; added executable-find + :version "24.1" ; add executable-find, remove fakemail :group 'mail :type 'file) |