X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fmessage.el;h=e7bbff67503f2c841d4de69cb9c69b8710230118;hb=9e14eb0c8aaa5691f708a6a64a4eafe33b00501d;hp=acd546acfbee3d2e7493be5f1584b6171d1777e4;hpb=16b9dfbbeff811d8e55e60005d91e350103702a3;p=gnus

diff --git a/lisp/message.el b/lisp/message.el
index acd546acf..e7bbff675 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4535,8 +4535,9 @@ This function could be useful in `message-setup-hook'."
 	      (end-of-line)
 	      (insert (format " (%d/%d)" n total))
 	      (widen)
-              (funcall (or message-send-mail-real-function
-                           message-send-mail-function)))
+	      (if message-send-mail-real-function
+		  (funcall message-send-mail-real-function)
+		(message-multi-smtp-send-mail)))
 	    (setq n (+ n 1))
 	    (setq p (pop plist))
 	    (erase-buffer)))
@@ -4690,8 +4691,9 @@ If you always want Gnus to send messages in one piece, set
 ")))
 	      (progn
 		(message "Sending via mail...")
-		(funcall (or message-send-mail-real-function
-			     message-send-mail-function)))
+		(if message-send-mail-real-function
+		    (funcall message-send-mail-real-function)
+		  (message-multi-smtp-send-mail)))
 	    (message-send-mail-partially))
 	  (setq options message-options))
       (kill-buffer tembuf))
@@ -4701,6 +4703,12 @@ If you always want Gnus to send messages in one piece, set
 
 (defvar sendmail-program)
 
+(defun message-multi-smtp-send-mail ()
+  "Send the current buffer to `message-send-mail-function'.
+Or, if there's a header that specifies a different method, use
+that instead."
+  (funcall message-send-mail-function))
+
 (defun message-send-mail-with-sendmail ()
   "Send off the prepared buffer with sendmail."
   (require 'sendmail)