(std11-lexical-analyze): Change interface to add new optional argument

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

diff --git a/mime-parse.el b/mime-parse.el
index fa20a85..e22747d 100644 (file)
--- a/mime-parse.el
+++ b/mime-parse.el
@@ -1,6 +1,6 @@
 ;;; mime-parse.el --- MIME message parser
 
-;; Copyright (C) 1994,1995,1996,1997,1998 Free Software Foundation, Inc.
+;; Copyright (C) 1994,1995,1996,1997,1998,1999 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Keywords: parse, MIME, multimedia, mail, news
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-(require 'emu)
+;;(require 'emu)
 (require 'std11)
 (require 'mime-def)
 
@@ -96,13 +96,16 @@ and return parsed it.  Format of return value is as same as
 ;;; @ Content-Disposition
 ;;;
 
-(defconst mime-disposition-type-regexp mime-token-regexp)
+(eval-and-compile
+  (defconst mime-disposition-type-regexp mime-token-regexp)
+  )
 
 ;;;###autoload
 (defun mime-parse-Content-Disposition (string)
   "Parse STRING as field-body of Content-Disposition field."
   (setq string (std11-unfold-string string))
-  (if (string-match `,(concat "^" mime-disposition-type-regexp) string)
+  (if (string-match (eval-when-compile
+                     (concat "^" mime-disposition-type-regexp)) string)
       (let* ((e (match-end 0))
             (type (downcase (substring string 0 e)))
             ret dest)
@@ -131,10 +134,16 @@ and return parsed it."
 ;;;###autoload
 (defun mime-parse-Content-Transfer-Encoding (string)
   "Parse STRING as field-body of Content-Transfer-Encoding field."
-  (if (string-match "[ \t\n\r]+$" string)
-      (setq string (match-string 0 string))
-    )
-  (downcase string))
+  (let ((tokens (std11-lexical-analyze string))
+       token)
+    (while (and tokens
+               (setq token (car tokens))
+               (std11-ignored-token-p token))
+      (setq tokens (cdr tokens)))
+    (if token
+       (if (eq (car token) 'atom)
+           (downcase (cdr token))
+         ))))
 
 ;;;###autoload
 (defun mime-read-Content-Transfer-Encoding (&optional default-encoding)
@@ -242,6 +251,9 @@ If is is not found, return DEFAULT-ENCODING."
     (make-mime-entity-internal representation-type
                               (current-buffer)
                               content-type nil parent node-id
+                              nil nil nil nil
+                              nil nil nil nil
+                              nil nil
                               (current-buffer)
                               header-start header-end
                               body-start body-end)