# HG changeset patch
# User Reiner Steib <Reiner.Steib@gmx.de>
# Date 1195595346 0
# Node ID b53cbc241b6f6ad9b6393d69aac0e99c7c2a2ddb
# Parent  50442c77e2421694932b66956a2b7deefe376a7c
(message-send-mail-function): Check for smtpmail too.

diff -r 50442c77e242 -r b53cbc241b6f lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Tue Nov 20 21:06:35 2007 +0000
+++ b/lisp/gnus/ChangeLog	Tue Nov 20 21:49:06 2007 +0000
@@ -1,5 +1,7 @@
 2007-11-20  Reiner Steib  <Reiner.Steib@gmx.de>
 
+	* message.el (message-send-mail-function): Check for smtpmail too.
+
 	* utf7.el (utf7-encode, utf7-decode): Use coding system
 	`utf-7'/`utf-7-imap' from utf-7.el' if available.
 
diff -r 50442c77e242 -r b53cbc241b6f lisp/gnus/message.el
--- a/lisp/gnus/message.el	Tue Nov 20 21:06:35 2007 +0000
+++ b/lisp/gnus/message.el	Tue Nov 20 21:49:06 2007 +0000
@@ -624,13 +624,17 @@
 (defun message-send-mail-function ()
   "Return suitable value for the variable `message-send-mail-function'."
   (cond ((and sendmail-program
-	      (executable-find program))
+	      (executable-find sendmail-program))
 	 'message-send-mail-with-sendmail)
-	((and (locate-library "mailclient")
-	      (memq system-type '(darwin windows-nt)))
+	((and (locate-library "smtpmail")
+	      (require 'smtpmail)
+	      smtpmail-default-smtp-server)
+	 'message-smtpmail-send-it)
+	((locate-library "mailclient")
 	 'message-send-mail-with-mailclient)
 	(t
-	 'message-smtpmail-send-it)))
+	 (lambda ()
+	   (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)