From: ueno <ueno>
Date: Mon, 4 Dec 2000 01:40:46 +0000 (+0000)
Subject: * smtpmail.el (smtpmail-send-it): Use `smtp-send-buffer' instead of
X-Git-Tag: deisui-1_14_0-2000-12-14~7
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7fcc7950c31f87c2b0d71456c9aa61ec3971a0f;p=elisp%2Fflim.git

* smtpmail.el (smtpmail-send-it): Use `smtp-send-buffer' instead of
`smtp-via-smtp'.
(smtpmail-send-queued-mail): Ditto.
---

diff --git a/smtpmail.el b/smtpmail.el
index 74638aa..8582394 100644
--- a/smtpmail.el
+++ b/smtpmail.el
@@ -226,10 +226,9 @@ This is relative to `smtpmail-queue-dir'.")
 	  ; Send or queue
 	  (if (not smtpmail-queue-mail)
 	      (if smtpmail-recipient-address-list
-		  (if (not (smtp-via-smtp user-mail-address
-					  smtpmail-recipient-address-list
-					  tembuf))
-		      (error "Sending failed; SMTP protocol error"))
+		  (smtp-send-buffer user-mail-address
+				    smtpmail-recipient-address-list
+				    tembuf)
 		(error "Sending failed; no recipients"))
 	    (let* ((file-data (convert-standard-filename
 			       (concat
@@ -284,9 +283,8 @@ This is relative to `smtpmail-queue-dir'.")
 	(load file-msg)
 	(setq tembuf (find-file-noselect-as-binary file-msg))
 	(if smtpmail-recipient-address-list
-	    (if (not (smtp-via-smtp user-mail-address
-				    smtpmail-recipient-address-list tembuf))
-		(error "Sending failed; SMTP protocol error"))
+	    (smtp-send-buffer user-mail-address
+			      smtpmail-recipient-address-list tembuf)
 	  (error "Sending failed; no recipients"))  
 	(delete-file file-msg)
 	(delete-file (concat file-msg ".el"))