* mail/sendmail.el (send-mail-function): Change the default to `sendmail-query-once'.

2 files changed, 6 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 29c1a1220ab..030f86192f9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * mail/sendmail.el (send-mail-function): Change the default to
+        `sendmail-query-once'.
+
         * net/network-stream.el (network-stream-open-starttls): Try using
         a plain connection even if the server offered STARTTLS, and we
         kinda wanted to use it, if Emacs doesn't have any STARTTLS
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 13da0627fff..47a6d0af0c5 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -144,19 +144,11 @@ Otherwise, let mailer send back a message to report errors."
 ;;;###autoload
 (put 'send-mail-function 'standard-value
      ;; MS-Windows can access the clipboard even under -nw.
-     '((if (or (and window-system (eq system-type 'darwin))
-               (eq system-type 'windows-nt))
-           'mailclient-send-it
-         'sendmail-send-it)))
+     '('sendmail-query-once))
 
 ;; Useful to set in site-init.el
 ;;;###autoload
-(defcustom send-mail-function
-  (if (or (and window-system (eq system-type 'darwin))
-          ;; MS-Windows can access the clipboard even under -nw.
-          (eq system-type 'windows-nt))
-      'mailclient-send-it
-    'sendmail-send-it)
+(defcustom send-mail-function 'sendmail-query-once
   "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,
@@ -170,6 +162,7 @@ This is used by the default mail-sending commands.  See also
                 (function-item mailclient-send-it :tag "Use Mailclient package")
                 function)
   :initialize 'custom-initialize-delay
+  :version "24.1"
   :group 'sendmail)
 
 (defvar sendmail-query-once-function 'query