(message-send-mail-function): Check for smtpmail too.

2 files changed, 10 insertions, 4 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index dd8b059c55..8bd32cfc66 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,7 @@
 2007-11-20  Reiner Steib  <[email protected]>
 
+	* 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 --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 66e14f0e09..51408995ef 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -624,13 +624,17 @@ Done before generating the new subject of a forward."
 (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)