X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-def.el;h=c74f4454fd4b523365f0d9ea3074787def3b2906;hb=2ab6f6d72b13ac9b146cee9066ccff420214f3fa;hp=7cb0f7ba907932b407c41ccb664d2673100c7580;hpb=2c80ce7a636b0e4b45600772b3071860dfbc0a2a;p=elisp%2Fflim.git

diff --git a/mime-def.el b/mime-def.el
index 7cb0f7b..c74f445 100644
--- a/mime-def.el
+++ b/mime-def.el
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-(defconst mime-library-version-string "FLIM 1.6.1 - \"Iseda\"")
+(defconst mime-library-version-string "Chao 1.6.1 - \"Ky,Dr(Bto\"")
 
 
 ;;; @ variables
@@ -182,52 +182,37 @@
 ;;; @ MIME entity
 ;;;
 
-(defsubst make-mime-entity (buffer
-			    header-start header-end body-start body-end
-			    &optional node-id
-			    content-type content-disposition
-			    encoding children)
+(defsubst make-mime-entity-internal (buffer
+				     header-start header-end
+				     body-start body-end
+				     &optional node-id
+				     content-type encoding children)
   (vector buffer header-start header-end body-start body-end
-	  node-id content-type content-disposition encoding nil
+	  node-id content-type nil encoding nil
 	  children nil))
 
-(defsubst mime-entity-buffer (entity)              (aref entity  0))
-(defsubst mime-entity-header-start (entity)        (aref entity  1))
-(defsubst mime-entity-header-end (entity)          (aref entity  2))
-(defsubst mime-entity-body-start (entity)          (aref entity  3))
-(defsubst mime-entity-body-end (entity)            (aref entity  4))
-(defsubst mime-entity-node-id (entity)             (aref entity  5))
-(defsubst mime-entity-content-type (entity)        (aref entity  6))
-(defsubst mime-entity-content-disposition (entity) (aref entity  7))
-(defsubst mime-entity-encoding (entity)            (aref entity  8))
-(defsubst mime-entity-original-header (entity)     (aref entity  9))
-(defsubst mime-entity-children (entity)            (aref entity 10))
-(defsubst mime-entity-parsed-header (entity)       (aref entity 11))
-
-(defsubst mime-entity-set-original-header (entity header)
+(defsubst mime-entity-buffer-internal (entity)              (aref entity  0))
+(defsubst mime-entity-header-start-internal (entity)        (aref entity  1))
+(defsubst mime-entity-header-end-internal (entity)          (aref entity  2))
+(defsubst mime-entity-body-start-internal (entity)          (aref entity  3))
+(defsubst mime-entity-body-end-internal (entity)            (aref entity  4))
+(defsubst mime-entity-node-id-internal (entity)             (aref entity  5))
+(defsubst mime-entity-content-type-internal (entity)        (aref entity  6))
+(defsubst mime-entity-content-disposition-internal (entity) (aref entity  7))
+(defsubst mime-entity-encoding-internal (entity)            (aref entity  8))
+(defsubst mime-entity-original-header-internal (entity)     (aref entity  9))
+(defsubst mime-entity-children-internal (entity)            (aref entity 10))
+(defsubst mime-entity-parsed-header-internal (entity)       (aref entity 11))
+
+(defsubst mime-entity-set-content-disposition-internal (entity disposition)
+  (aset entity  7 disposition))
+(defsubst mime-entity-set-original-header-internal (entity header)
   (aset entity  9 header))
-(defsubst mime-entity-set-children (entity children)
+(defsubst mime-entity-set-children-internal (entity children)
   (aset entity 10 children))
-(defsubst mime-entity-set-parsed-header (entity header)
+(defsubst mime-entity-set-parsed-header-internal (entity header)
   (aset entity 11 header))
 
-(defsubst mime-entity-number (entity)
-  (reverse (mime-entity-node-id entity)))
-
-(defalias 'mime-entity-point-min 'mime-entity-header-start)
-(defalias 'mime-entity-point-max 'mime-entity-body-end)
-
-(defsubst mime-entity-media-type (entity)
-  (mime-content-type-primary-type (mime-entity-content-type entity)))
-(defsubst mime-entity-media-subtype (entity)
-  (mime-content-type-subtype (mime-entity-content-type entity)))
-(defsubst mime-entity-parameters (entity)
-  (mime-content-type-parameters (mime-entity-content-type entity)))
-
-(defsubst mime-entity-type/subtype (entity-info)
-  (mime-type/subtype-string (mime-entity-media-type entity-info)
-			    (mime-entity-media-subtype entity-info)))
-
 
 ;;; @ message structure
 ;;;