Synch with `flim-1_14'.

diff --git a/ChangeLog b/ChangeLog
index fec0599..d0cda92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2000-12-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
+       * mime.el (mime-entity-media-type): Add DOC.
+       (mime-entity-media-subtype): Add DOC.
+       (mime-entity-parameters): Add DOC.
+       (mime-entity-type/subtype): Add DOC.
+
+       * FLIM-API.en: Add some usages.
+       (mime-entity-media-type): New description.
+       (mime-entity-media-subtype): Likewise.
+       (mime-entity-type/subtype): Likewise.
+       (mime-entity-parameters): Likewise.
+
+2000-12-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
        * eword-encode.el (eword-encode-text): Specify `mode' of
        `encoded-text-encode-string'.
 

diff --git a/FLIM-API.en b/FLIM-API.en
index 3222cdd..0338d5c 100644 (file)
--- a/FLIM-API.en
+++ b/FLIM-API.en
@@ -59,6 +59,7 @@ ULEVEL specifies implementation level:
   representation-type.
 
   [Required]<Suggest>
+  (Usage: SEMI 1.14 MIME-View)
 
 
 [Function] mime-parse-buffer (&optional buffer representation-type)
@@ -75,6 +76,7 @@ ULEVEL specifies implementation level:
   Return list of entities included in the ENTITY.
 
   [Required]<Suggest>
+  (Usage: SEMI 1.14 MIME-View, MIME-PGP)
 
 
 [Function] mime-entity-parent (entity &optional message)
@@ -83,6 +85,7 @@ ULEVEL specifies implementation level:
   If MESSAGE is specified, it is regarded as root entity.
 
   [Suggest]
+  (Usage: SEMI 1.14 MIME-View, MIME-PGP)
 
 
 [Function] mime-find-root-entity (entity)
@@ -103,12 +106,14 @@ ULEVEL specifies implementation level:
   Return node-id of ENTITY.
 
   [Suggest]
+  (Usage: SEMI 1.14 MIME-View, MIME-PGP)
 
 
 [Function] mime-entity-number (entity)
   Return entity-number of ENTITY.
 
   [Optional]
+  (Usage: SEMI 1.14 MIME-View, MIME-PGP)
 
 
 ** MIME-Entity Search
@@ -139,6 +144,35 @@ ULEVEL specifies implementation level:
   (cf. <** Content-Type>)
 
   [Suggest]
+  (Usage: SEMI 1.14 MIME-View)
+
+
+[Inline function] mime-entity-media-type (entity)
+  Return primary media-type of ENTITY.
+
+  [Suggest]<Not Suggest>
+  (Usage: SEMI 1.14 MIME-View)
+
+
+[Inline function] mime-entity-media-subtype (entity)
+  Return media-subtype of ENTITY.
+
+  [Suggest]<Not Suggest>
+  (Usage: SEMI 1.14 MIME-View)
+
+
+[Inline function] mime-entity-type/subtype (entity)
+  Return media-type/subtype of ENTITY.
+
+  [Suggest]
+  (Usage: SEMI 1.14 MIME-W3)
+
+
+[Inline function] mime-entity-parameters (entity)
+  Return parameters of Content-Type of ENTITY.
+
+  [Suggest]<Not Suggest>
+  (Usage: SEMI 1.14 MIME-View)
 
 
 [Function] mime-entity-set-content-type (entity content-type)
@@ -147,6 +181,7 @@ ULEVEL specifies implementation level:
   (cf. <** Content-Type>)
 
   [Suggest]
+  (Usage: SEMI 1.14 MIME-View)
 
 
 [Function] mime-entity-content-disposition (entity)
@@ -155,12 +190,14 @@ ULEVEL specifies implementation level:
   (cf. <** Content-Disposition>)
 
   [Suggest]
+  (Usage: SEMI 1.14 MIME-View)
 
 
 [Function] mime-entity-filename (entity)
   Return filename of ENTITY.
 
   [Suggest]
+  (Usage: SEMI 1.14 MIME-View)
 
 
 [Function] mime-entity-encoding (entity &optional default-encoding)
@@ -171,12 +208,14 @@ ULEVEL specifies implementation level:
   default value.
 
   [Suggest]
+  (Usage: SEMI 1.14 MIME-View)
 
 
 [Function] mime-entity-set-encoding (entity encoding)
   Set ENTITY's content-transfer-encoding to ENCODING.
 
   [Suggest]
+  (Usage: SEMI 1.14 MIME-View)
 
 
 [Function] mime-entity-cooked-p (entity)
@@ -184,12 +223,14 @@ ULEVEL specifies implementation level:
   code-converted.
 
   [Suggest]
+  (Usage: SEMI 1.14 MIME-PGP)
 
 
 [Function] mime-entity-name (entity)
   Return unique name of the ENTITY.
 
   [Suggest]
+  (Usage: SEMI 1.14 MIME-View)
 
 
 ** MIME-Entity Header
@@ -203,6 +244,7 @@ ULEVEL specifies implementation level:
   If FIELD-NAME field is not found, this function returns nil.
 
   [Required]<Suggest>
+  (Usage: SEMI 1.14 MIME-View, MIME-BBDB)
 
 
 [Function] mime-entity-read-field (entity field-name)
@@ -218,6 +260,7 @@ ULEVEL specifies implementation level:
   If FIELD-NAME field is not found, this function returns nil.
 
   [Suggest]
+  (Usage: SEMI 1.14 MIME-View, MIME-BBDB)
 
 
 ** Text Presentation of MIME-Entity Content
@@ -265,6 +308,7 @@ ULEVEL specifies implementation level:
   Return content of ENTITY as byte sequence (string).
 
   [Required]
+  (Usage: SEMI 1.14 MIME-View, Postpet)
 
 
 [Function] mime-insert-entity-content (entity)

diff --git a/mime.el b/mime.el
index ac12b18..8d6a146 100644 (file)
--- a/mime.el
+++ b/mime.el
@@ -407,12 +407,19 @@ default value."
 
 
 (defsubst mime-entity-media-type (entity)
+  "Return primary media-type of ENTITY."
   (mime-content-type-primary-type (mime-entity-content-type entity)))
+
 (defsubst mime-entity-media-subtype (entity)
+  "Return media-subtype of ENTITY."
   (mime-content-type-subtype (mime-entity-content-type entity)))
+
 (defsubst mime-entity-parameters (entity)
+  "Return parameters of Content-Type of ENTITY."
   (mime-content-type-parameters (mime-entity-content-type entity)))
+
 (defsubst mime-entity-type/subtype (entity-info)
+  "Return type/subtype of Content-Type of ENTITY."
   (mime-type/subtype-string (mime-entity-media-type entity-info)
                            (mime-entity-media-subtype entity-info)))