2010-02-26 Glenn Morris <rgm@gnu.org>

	* message.el (message-send-mail-function): Change the default, so that
	it inherits from a customized send-mail-function.  (Bug#5643)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c49ba7a..e83cbec 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-26  Glenn Morris  <rgm@gnu.org>
+
+       * message.el (message-send-mail-function): Change the default, so that
+       it inherits from a customized send-mail-function.  (Bug#5643)
+
 2010-02-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * gnus-art.el (gnus-treat-display-x-face): Don't burp if

diff --git a/lisp/message.el b/lisp/message.el
index 21fb83a..2911beb 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -663,7 +663,12 @@ Done before generating the new subject of a forward."
           (error "Don't know how to send mail.  Please customize `message-send-mail-function'")))))
 
 ;; Useful to set in site-init.el
-(defcustom message-send-mail-function (message-send-mail-function)
+(defcustom message-send-mail-function
+  (cond ((eq send-mail-function 'smtpmail-send-it) 'message-smtpmail-send-it)
+       ((eq send-mail-function 'feedmail-send-it) 'feedmail-send-it)
+       ((eq send-mail-function 'mailclient-send-it)
+        'message-send-mail-with-mailclient)
+       (t (message-send-mail-function)))
   "Function to call to send the current buffer as mail.
 The headers should be delimited by a line whose contents match the
 variable `mail-header-separator'.
@@ -686,7 +691,7 @@ See also `send-mail-function'."
                               :tag "Use Mailclient package")
                (function :tag "Other"))
   :group 'message-sending
-  :version "23.1" ;; No Gnus
+  :version "23.2"
   :initialize 'custom-initialize-default
   :link '(custom-manual "(message)Mail Variables")
   :group 'message-mail)