From: morioka <morioka>
Date: Thu, 12 Mar 1998 19:31:22 +0000 (+0000)
Subject: Sync with main branch.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffdd1c3b1384ecf145aea490c4fe31ce04c7bdc7;p=elisp%2Fsemi.git

Sync with main branch.
---

diff --git a/mailcap.el b/mailcap.el
index fcc47b5..f3b82ce 100644
--- a/mailcap.el
+++ b/mailcap.el
@@ -61,9 +61,9 @@
 	  (forward-char)
 	  (let ((subtype (mailcap-look-at-token)))
 	    (if subtype
-		(cons (cons 'type type)
+		(cons (cons 'type (intern type))
 		      (unless (string= subtype "*")
-			(list (cons 'subtype subtype))
+			(list (cons 'subtype (intern subtype)))
 			))))))))
 
 
@@ -166,6 +166,21 @@ order.  Otherwise result is not sorted."
 	    (t entries)
 	    ))))
 
+(defvar mailcap-file "~/.mailcap"
+  "*File name of user's mailcap file.")
+
+(defun mailcap-parse-file (&optional filename order)
+  "Parse FILENAME as a mailcap, and return the result.
+If optional argument ORDER is a function, result is sorted by it.
+If optional argument ORDER is not specified, result is sorted original
+order.  Otherwise result is not sorted."
+  (or filename
+      (setq filename mailcap-file))
+  (with-temp-buffer
+    (insert-file-contents filename)
+    (mailcap-parse-buffer (current-buffer) order)
+    ))
+
 
 ;;; @ end
 ;;;