summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-02-25 20:45:41 -0800
committerGlenn Morris <rgm@gnu.org>2010-02-25 20:45:41 -0800
commitac1af6357af9c361b8578a3cb3d020f2ba5661b7 (patch)
tree845e8f9bf3918c752ae97cb3caf1378231481db5
parent90a946031af5a128df5d6027a94b9183b50a69b0 (diff)
downloademacs-ac1af6357af9c361b8578a3cb3d020f2ba5661b7.tar.gz
Close bug#5643.
* message.el (message-send-mail-function): Change the default, so that it inherits from a customized send-mail-function. (Bug#5643)
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/message.el9
2 files changed, 12 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7ab323d74d4..0a6a6a888bd 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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/gnus/message.el b/lisp/gnus/message.el
index 2bf9190a189..d255e3410bd 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -675,7 +675,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'.
@@ -698,7 +703,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)