[Emacs-diffs] /srv/bzr/emacs/trunk r99562: Close bug#5643.

[Glenn Morris]

------------------------------------------------------------
revno: 99562
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-02-25 20:45:41 -0800
message:
  Close bug#5643.
  
  * message.el (message-send-mail-function): Change the default, so that
  it inherits from a customized send-mail-function.  (Bug#5643)
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-02-24 16:40:04 +0000
+++ b/lisp/gnus/ChangeLog       2010-02-26 04:45:41 +0000
@@ -1,3 +1,8 @@
+2010-02-26  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-art.el (gnus-treat-display-x-face): Don't burp if

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2010-02-24 03:12:54 +0000
+++ b/lisp/gnus/message.el      2010-02-26 04:45:41 +0000
@@ -675,7 +675,12 @@
           (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'.
@@ -698,7 +703,7 @@
                               :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)