From aa3733b7aff4882f34690fe13f8df5f8c22e0fbb Mon Sep 17 00:00:00 2001
From: morioka <morioka>
Date: Thu, 12 Mar 1998 19:31:13 +0000
Subject: [PATCH] Sync with main branch.

---
 ChangeLog |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d94d998..c937362 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 1998-03-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
+	* mailcap.el (mailcap-look-at-type-field): Change type and subtype
+	to symbol.
+
+	* mailcap.el (mailcap-file): New variable.
+	(mailcap-parse-file): New function.
+
+1998-03-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
 	* README.en (What's SEMI?): Remove what does SEMI stand for.
 
 1998-03-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
-- 
1.7.10.4