From: yamaoka <yamaoka>
Date: Thu, 21 Dec 2000 03:36:08 +0000 (+0000)
Subject: Synch with `flim-1_14'.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=285604e7eff3c4b8e72577fed7204df967f649b0;p=elisp%2Fflim.git

Synch with `flim-1_14'.
---

diff --git a/ChangeLog b/ChangeLog
index d0cda92..bdac0c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-12-21   Daiki Ueno  <ueno@unixuser.org>
+
+	* smtp.el (smtp-send-buffer): Add DOC.
+	(smtp-via-smtp): Add DOC.
+
+	* FLIM-API.en (QMTP): Remove section.
+	(smtp-send-buffer): Add description.
+	(smtp-via-smtp): Likewise.
+
 2000-12-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* mime.el (mime-entity-media-type): Add DOC.
diff --git a/FLIM-API.en b/FLIM-API.en
index 0338d5c..1705407 100644
--- a/FLIM-API.en
+++ b/FLIM-API.en
@@ -895,17 +895,15 @@ If BOUNDARY is not nil, it is used as message header separator.
 ** Features
 
 [Function] smtp-send-buffer (sender recipients buffer)
-  (This description will be written by Daiki Ueno <ueno@unixuser.org>)
+  Send a message.
 
+  SENDER is an envelope sender address.
+  RECIPIENTS is a list of envelope recipient addresses.
+  BUFFER may be a buffer or a buffer name which contains mail message.
 
-* QMTP
-
-** How to use
-
-(require 'qmtp)
-
+  [Suggest]
 
-** Features
+[Function] smtp-via-smtp (sender recipients buffer)
+  Like `smtp-send-buffer', but sucks in any errors.
 
-[Function] qmtp-send-buffer (sender recipients buffer)
-  (This description will be written by Daiki Ueno <ueno@unixuser.org>)
+  [Optional]<Not Suggest>
diff --git a/smtp.el b/smtp.el
index c63c81b..cb55936 100644
--- a/smtp.el
+++ b/smtp.el
@@ -250,6 +250,7 @@ of the host to connect to.  SERVICE is name of the service desired."
 
 ;;;###autoload
 (defun smtp-via-smtp (sender recipients buffer)
+  "Like `smtp-send-buffer', but sucks in any errors."
   (condition-case nil
       (progn
 	(smtp-send-buffer sender recipients buffer)
@@ -260,6 +261,10 @@ of the host to connect to.  SERVICE is name of the service desired."
 
 ;;;###autoload
 (defun smtp-send-buffer (sender recipients buffer)
+  "Send a message.
+SENDER is an envelope sender address.
+RECIPIENTS is a list of envelope recipient addresses.
+BUFFER may be a buffer or a buffer name which contains mail message."
   (let ((server
 	 (if (functionp smtp-server)
 	     (funcall smtp-server sender recipients)