This commit was generated by cvs2svn to compensate for changes in r500,

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

diff --git a/tm-parse.el b/tm-parse.el
index 01ae867..40d5f5f 100644 (file)
--- a/tm-parse.el
+++ b/tm-parse.el
@@ -3,8 +3,7 @@
 ;; Copyright (C) 1994,1995,1996 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version:
-;;     $Id: tm-parse.el,v 7.12 1996/09/14 08:51:36 morioka Exp $
+;; Version: $Id: tm-parse.el,v 7.16 1996/12/17 11:44:55 morioka Exp $
 ;; Keywords: mail, news, MIME, multimedia
 
 ;; This file is part of tm (Tools for MIME).
@@ -20,8 +19,8 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
@@ -34,6 +33,21 @@
 ;;; @ field parser
 ;;;
 
+(defconst rfc822/quoted-pair-regexp "\\\\.")
+(defconst rfc822/qtext-regexp
+  (concat "[^" (char-list-to-string std11-non-qtext-char-list) "]"))
+(defconst rfc822/quoted-string-regexp
+  (concat "\""
+         (regexp-*
+          (regexp-or rfc822/qtext-regexp rfc822/quoted-pair-regexp)
+          )
+         "\""))
+
+(defconst mime/content-parameter-value-regexp
+  (concat "\\("
+         rfc822/quoted-string-regexp
+         "\\|[^; \t\n]*\\)"))
+
 (defconst mime::parameter-regexp
   (concat "^[ \t]*\;[ \t]*\\(" mime/token-regexp "\\)"
          "[ \t]*=[ \t]*\\(" mime/content-parameter-value-regexp "\\)"))
@@ -186,7 +200,9 @@ and return parsed it. [tm-parse.el]"
             (setq boundary (std11-strip-quoted-string (cdr boundary)))
             (mime/parse-multipart boundary ctype params encoding rcnum)
             )
-           ((string-equal ctype "message/rfc822")
+           ((or (string-equal ctype "message/rfc822")
+                (string-equal ctype "message/news")
+                )
             (goto-char (point-min))
             (mime::content-info/create rcnum
                                        (point-min) (point-max)