2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43320f3d00e..1bdbfd1a077 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-16  David Reitter <david.reitter@gmail.com>
+
+        * mail/sendmail.el (send-mail-function): Use mailclient-send-it
+        as default on darwin and windows systems.
+
 2005-10-16  Sven Joachim  <svenjoac@gmx.de>  (tiny change)
 
         * arc-mode.el (archive-zip-extract): Doc fix.
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index f7c62026d80..81afe688c10 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -120,7 +120,10 @@ nil means let mailer mail back a message to report errors."
 
 ;; Useful to set in site-init.el
 ;;;###autoload
-(defcustom send-mail-function 'sendmail-send-it
+(defcustom send-mail-function 
+  (if (and window-system (memq system-type '(darwin windows-nt)))
+      'mailclient-send-it
+    'sendmail-send-it)
   "Function to call to send the current buffer as mail.
 The headers should be delimited by a line which is
 not a valid RFC822 header or continuation line,