This commit was manufactured by cvs2svn to create branch 'chao'.

[elisp/flim.git] / mime-def.el

diff --git a/mime-def.el b/mime-def.el
index 15f66e4..bd63c7c 100644 (file)
--- a/mime-def.el
+++ b/mime-def.el
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-(defconst mime-library-version-string "FLIM 1.5.0 - \"Mukaijima\"")
+(defconst mime-library-version-string "Chao 1.4.0 - \"J\e,D~\e(Bj\e,Dr\e(B\"")
 
 
 ;;; @ variables
@@ -32,8 +32,6 @@
 
 (require 'custom)
 
-(eval-when-compile (require 'cl))
-
 (defgroup mime nil
   "Emacs MIME Interfaces"
   :group 'news
@@ -95,7 +93,8 @@
 (defconst std11-quoted-string-regexp
   (concat "\""
          (regexp-*
-          (regexp-or std11-qtext-regexp std11-quoted-pair-regexp))
+          (regexp-or std11-qtext-regexp std11-quoted-pair-regexp)
+          )
          "\""))
 
 
@@ -120,52 +119,6 @@
          "][" quoted-printable-hex-chars "]"))
 
 
-;;; @ Content-Type
-;;;
-
-(defsubst make-mime-content-type (type subtype &optional parameters)
-  (list* (cons 'type type)
-        (cons 'subtype subtype)
-        (nreverse parameters))
-  )
-
-(defsubst mime-content-type-primary-type (content-type)
-  "Return primary-type of CONTENT-TYPE."
-  (cdr (car content-type)))
-
-(defsubst mime-content-type-subtype (content-type)
-  "Return primary-type of CONTENT-TYPE."
-  (cdr (cadr content-type)))
-
-(defsubst mime-content-type-parameters (content-type)
-  "Return primary-type of CONTENT-TYPE."
-  (cddr content-type))
-
-(defsubst mime-content-type-parameter (content-type parameter)
-  "Return PARAMETER value of CONTENT-TYPE."
-  (cdr (assoc parameter (mime-content-type-parameters content-type))))
-
-
-;;; @ Content-Disposition
-;;;
-
-(defsubst mime-content-disposition-type (content-disposition)
-  "Return disposition-type of CONTENT-DISPOSITION."
-  (cdr (car content-disposition)))
-
-(defsubst mime-content-disposition-parameters (content-disposition)
-  "Return disposition-parameters of CONTENT-DISPOSITION."
-  (cdr content-disposition))
-
-(defsubst mime-content-disposition-parameter (content-disposition parameter)
-  "Return PARAMETER value of CONTENT-DISPOSITION."
-  (cdr (assoc parameter (cdr content-disposition))))
-
-(defsubst mime-content-disposition-filename (content-disposition)
-  "Return filename of CONTENT-DISPOSITION."
-  (mime-content-disposition-parameter content-disposition "filename"))
-
-
 ;;; @ MIME-entity
 ;;;
 
@@ -199,20 +152,6 @@
 (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)))
-
 
 ;;; @ utility
 ;;;