tm 7.10.

[elisp/tm.git] / tm-parse.el

diff --git a/tm-parse.el b/tm-parse.el
index 3a4d810..e1d2c30 100644 (file)
--- a/tm-parse.el
+++ b/tm-parse.el
@@ -6,13 +6,13 @@
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Version:
-;;;    $Id: tm-parse.el,v 2.4 1995/09/26 13:19:32 morioka Exp $
+;;;    $Id: tm-parse.el,v 3.0 1995/10/05 11:28:40 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia
 ;;;
 ;;; This file is part of tm (Tools for MIME).
 ;;;
 
-(require 'tl-header)
+(require 'tl-822)
 (require 'tl-misc)
 (require 'tm-def)
 
@@ -29,7 +29,7 @@
       (let ((e (match-end 2)))
        (cons
         (cons (downcase (substring str (match-beginning 1) (match-end 1)))
-              (message/strip-quoted-string
+              (rfc822/strip-quoted-string
                (substring str (match-beginning 2) e))
               )
         (substring str e)
@@ -40,7 +40,7 @@
 
 (defun mime/parse-Content-Type (str)
   "Parse STR as field-body of Content-Type field. [tm-parse.el]"
-  (setq str (message/unfolding-string str))
+  (setq str (rfc822/unfolding-string str))
   (if (string-match mime::ctype-regexp str)
       (let* ((e (match-end 0))
             (ctype (downcase (substring str 0 e)))
@@ -60,7 +60,7 @@
 (defun mime/Content-Type ()
   "Read field-body of Content-Type field from current-buffer,
 and return parsed it. [tm-parse.el]"
-  (let ((str (message/get-field-body "Content-Type")))
+  (let ((str (rfc822/get-field-body "Content-Type")))
     (if str
        (mime/parse-Content-Type str)
       )))
@@ -69,7 +69,7 @@ and return parsed it. [tm-parse.el]"
   "Read field-body of Content-Transfer-Encoding field from
 current-buffer, and return it.
 If is is not found, return DEFAULT-ENCODING. [tm-parse.el]"
-  (let ((str (message/get-field-body "Content-Transfer-Encoding")))
+  (let ((str (rfc822/get-field-body "Content-Transfer-Encoding")))
     (if str
        (downcase str)
       default-encoding)
@@ -132,7 +132,7 @@ If is is not found, return DEFAULT-ENCODING. [tm-parse.el]"
        )
     (let ((boundary (assoc "boundary" params)))
       (cond (boundary
-            (setq boundary (message/strip-quoted-string (cdr boundary)))
+            (setq boundary (rfc822/strip-quoted-string (cdr boundary)))
             (mime/parse-multipart boundary ctype params encoding)
             )
            ((string= ctype "message/rfc822")