Merge flim-1_11_0.

[elisp/flim.git] / mime-en.sgml

diff --git a/mime-en.sgml b/mime-en.sgml
index 1aeb63c..2523585 100644 (file)
--- a/mime-en.sgml
+++ b/mime-en.sgml
@@ -264,7 +264,11 @@ If <var>field-name</var> field is not found, this function returns
 <code>nil</code>.
 </defun>
 
-<defun name="mime-insert-decoded-header">
+
+<h2> Text presentation of entity
+<node> entity formatting
+<p>
+<defun name="mime-insert-header">
            <args> entity <opts> invisible-fields visible-fields
 <p>
 Insert before point a decoded contents of header of <var>entity</var>.
@@ -276,8 +280,32 @@ field-name to hide.
 If a field-name is matched with some elements of
 <var>invisible-fields</var> and matched with none of
 <var>visible-fields</var>, this function don't insert the field.
+<p>
+Each <dref>encoded-word</dref> in the header is decoded.  ``Raw non
+us-ascii characters'' are also decoded as
+<code>default-mime-charset</code>.
 </defun>
 
+<defun name="mime-insert-text-content">
+           <args> entity
+<p>
+Insert before point a contents of <var>entity</var> as text entity.
+<p>
+Contents of the <var>entity</var> are decoded as <dref>MIME
+charset</dref>.  If the <var>entity</var> does not have charset
+parameter of Content-Type field, <code>default-mime-charset</code> is
+used as default value.
+</defun>
+
+<defvar name="default-mime-charset">
+<p>
+Symbol to indicate default value of <dref>MIME-charset</dref>.
+<p>
+It is used when MIME-charset is not specified.
+<p>
+It is originally variable of APEL.
+</defvar>
+
 
 <h2> Contents of Entity
 <node> Entity-content
@@ -857,14 +885,6 @@ MIME \e$B4XO"5!G=$K4X$9$k\e(B group.
 <code>mail</code> \e$B$H\e(B <code>news</code> \e$B$KB0$9$k!#\e(B
 </define>
 
-<defvar name="default-mime-charset">
-<p>
-\e$BE,@Z$J\e(B <dref>MIME charset</dref> \e$B$,8+$D$+$i$J$+$C$?>l9g$KMQ$$$i$l$k\e(B
-MIME charset.
-<p>
-\e$BK\Mh$O\e(B APEL \e$B$NJQ?t$G$"$k!#\e(B
-</defvar>
-
 <defvar name="mime-temp-directory">
 <p>
 MIME \e$B5!G=$K4X$9$k<BAu$,0l;~E*$K;HMQ$9$k\e(B file \e$B$r:n@.$9$k\e(B directory.