Move every definitions to mime.el.

diff --git a/mime-lib.el b/mime-lib.el
index 826d9a5..bdee3ec 100644 (file)
--- a/mime-lib.el
+++ b/mime-lib.el
@@ -24,122 +24,7 @@
 
 ;;; Code:
 
-(require 'alist)
-(require 'std11)
-(require 'mime-def)
-(require 'eword-decode)
-
-(autoload 'eword-encode-field "eword-encode"
-  "Encode header field STRING, and return the result.")
-(autoload 'eword-encode-header "eword-encode"
-  "Encode header fields to network representation, such as MIME encoded-word.")
-
-
-(autoload 'mime-parse-Content-Type "mime-parse"
-  "Parse STRING as field-body of Content-Type field.")
-(autoload 'mime-read-Content-Type "mime-parse"
-  "Read field-body of Content-Type field from current-buffer,
-and return parsed it.")
-
-(autoload 'mime-parse-Content-Disposition "mime-parse"
-  "Parse STRING as field-body of Content-Disposition field.")
-(autoload 'mime-read-Content-Disposition "mime-parse"
-  "Read field-body of Content-Disposition field from current-buffer,
-and return parsed it.")
-
-(autoload 'mime-parse-Content-Transfer-Encoding "mime-parse"
-  "Parse STRING as field-body of Content-Transfer-Encoding field.")
-(autoload 'mime-read-Content-Transfer-Encoding "mime-parse"
-  "Read field-body of Content-Transfer-Encoding field from
-current-buffer, and return it.")
-
-(autoload 'mime-parse-message "mime-parse"
-  "Parse current-buffer as a MIME message.")
-
-(autoload 'mime-parse-buffer "mime-parse"
-  "Parse BUFFER as a MIME message.")
-
-
-;;; @ MIME entity
-;;;
-
-(defun mime-entity-fetch-field (entity field-name)
-  (or (symbolp field-name)
-      (setq field-name (intern (capitalize (capitalize field-name)))))
-  (let* ((header (mime-entity-original-header entity))
-        (field-body (cdr (assq field-name header))))
-    (or field-body
-       (progn
-         (if (save-excursion
-               (set-buffer (mime-entity-buffer entity))
-               (save-restriction
-                 (narrow-to-region (mime-entity-header-start entity)
-                                   (mime-entity-header-end entity))
-                 (setq field-body
-                       (std11-fetch-field (symbol-name field-name)))
-                 ))
-             (mime-entity-set-original-header
-              entity (put-alist field-name field-body header))
-           )
-         field-body))))
-
-(defun mime-entity-read-field (entity field-name)
-  (or (symbolp field-name)
-      (setq field-name (capitalize (capitalize field-name))))
-  (cond ((eq field-name 'Content-Type)
-        (mime-entity-content-type entity)
-        )
-       ((eq field-name 'Content-Disposition)
-        (mime-entity-content-disposition entity)
-        )
-       ((eq field-name 'Content-Transfer-Encoding)
-        (mime-entity-encoding entity)
-        )
-       (t
-        (let* ((header (mime-entity-parsed-header entity))
-               (field (cdr (assq field-name header))))
-          (or field
-              (let ((field-body (mime-entity-fetch-field entity field-name)))
-                (when field-body
-                  (cond ((memq field-name '(From Resent-From
-                                            To Resent-To
-                                            Cc Resent-Cc
-                                            Bcc Resent-Bcc
-                                            Reply-To Resent-Reply-To))
-                         (setq field (std11-parse-addresses
-                                      (eword-lexical-analyze field-body)))
-                         )
-                        ((eq field-name '(Sender Resent-Sender))
-                         (setq field (std11-parse-address
-                                      (eword-lexical-analyze field-body)))
-                         )
-                        ((memq field-name eword-decode-ignored-field-list)
-                         (setq field field-body))
-                        ((memq field-name eword-decode-structured-field-list)
-                         (setq field (eword-decode-structured-field-body
-                                      field-body)))
-                        (t
-                         (setq field (eword-decode-unstructured-field-body
-                                      field-body))
-                         ))
-                  (mime-entity-set-parsed-header
-                   entity (put-alist field-name field header))
-                  field)))))))
-
-(defun mime-entity-content (entity)
-  (save-excursion
-    (set-buffer (mime-entity-buffer entity))
-    (mime-decode-string (buffer-substring (mime-entity-body-start entity)
-                                         (mime-entity-body-end entity))
-                       (mime-entity-encoding entity))))
-
-(defsubst mime-root-entity-p (entity)
-  "Return t if ENTITY is root-entity (message)."
-  (null (mime-entity-node-id entity)))
-
-
-;;; @ end
-;;;
+(require 'mime)
 
 (provide 'mime-lib)