updated.

[elisp/semi.git] / mime-parse.el

diff --git a/mime-parse.el b/mime-parse.el
index 2dc255e..df068dc 100644 (file)
--- a/mime-parse.el
+++ b/mime-parse.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1994,1995,1996,1997 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: mime-parse.el,v 0.7 1997-03-03 17:40:55 morioka Exp $
+;; Version: $Id: mime-parse.el,v 0.13 1997-07-07 17:08:03 morioka Exp $
 ;; Keywords: parse, MIME, multimedia, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -93,7 +93,7 @@ which are string or symbol."
          "\\|[^; \t\n]*\\)"))
 
 (defconst mime::parameter-regexp
-  (concat "^[ \t]*\;[ \t]*\\(" mime/token-regexp "\\)"
+  (concat "^[ \t]*\;[ \t]*\\(" mime-token-regexp "\\)"
          "[ \t]*=[ \t]*\\(" mime/content-parameter-value-regexp "\\)"))
 
 (defun mime-parse-parameter (str)
@@ -107,12 +107,10 @@ which are string or symbol."
         (substring str e)
         ))))
 
-(defconst mime::ctype-regexp (concat "^" mime/content-type-subtype-regexp))
-
 (defun mime-parse-Content-Type (string)
-  "Parse STRING as field-body of Content-Type field. [mime-parse.el]"
+  "Parse STRING as field-body of Content-Type field."
   (setq string (std11-unfold-string string))
-  (if (string-match mime::ctype-regexp string)
+  (if (string-match `,(concat "^" mime-media-type/subtype-regexp) string)
       (let* ((e (match-end 0))
             (ctype (downcase (substring string 0 e)))
             ret dest)
@@ -124,12 +122,10 @@ which are string or symbol."
        (cons ctype (nreverse dest))
        )))
 
-(defconst mime::dtype-regexp (concat "^" mime/disposition-type-regexp))
-
 (defun mime-parse-Content-Disposition (string)
-  "Parse STRING as field-body of Content-Disposition field. [mime-parse.el]"
+  "Parse STRING as field-body of Content-Disposition field."
   (setq string (std11-unfold-string string))
-  (if (string-match mime::dtype-regexp string)
+  (if (string-match `,(concat "^" mime-disposition-type-regexp) string)
       (let* ((e (match-end 0))
             (ctype (downcase (substring string 0 e)))
             ret dest)
@@ -202,7 +198,7 @@ and return parsed it. [mime-parse.el]"
              '("message/rfc822")
            '("text/plain")
            ))
-        cb ce ct ret ncb children (i 0))
+        cb ce ret ncb children (i 0))
     (save-restriction
       (narrow-to-region beg end)
       (goto-char beg)