From 660556fcbae7c8f2abe874a5673343195e4b95ca Mon Sep 17 00:00:00 2001
From: ShengHuo ZHU <zsh@cs.rochester.edu>
Date: Sun, 1 Oct 2000 20:13:21 +0000
Subject: [PATCH] 2000-10-01 17:08:50  ShengHuo ZHU  <zsh@cs.rochester.edu>

	* mailcap.el (mailcap-mime-types): Use mailcap-mime-data.
	* mml.el (mml-minibuffer-read-type): Use mailcap-mime-types.
---
 lisp/ChangeLog  |  5 +++++
 lisp/mailcap.el | 18 +++++++++++++++++-
 lisp/mml.el     | 20 +-------------------
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f08c8c53..90b556285 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-01 17:08:50  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* mailcap.el (mailcap-mime-types): Use mailcap-mime-data.
+	* mml.el (mml-minibuffer-read-type): Use mailcap-mime-types.
+
 2000-10-01 13:07:21  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* webmail.el (webmail-netscape-open, webmail-hotmail-article,
diff --git a/lisp/mailcap.el b/lisp/mailcap.el
index e91357356..aaa29fa4d 100644
--- a/lisp/mailcap.el
+++ b/lisp/mailcap.el
@@ -937,7 +937,23 @@ The path of COMMAND will be returned iff COMMAND is a command."
 (defun mailcap-mime-types ()
   "Return a list of MIME media types."
   (mailcap-parse-mimetypes)
-  (mm-delete-duplicates (mapcar 'cdr mailcap-mime-extensions)))
+  (mm-delete-duplicates
+   (nconc
+    (mapcar 'cdr mailcap-mime-extensions)
+    (apply
+     'nconc
+     (mapcar
+      (lambda (l)
+	(delq nil
+	      (mapcar
+	       (lambda (m)
+		 (let ((type (cdr (assq 'type (cdr m)))))
+		   (if (equal (cadr (split-string type "/"))
+			      "*")
+		       nil
+		     type)))
+	       (cdr l))))
+      mailcap-mime-data)))))
 
 (provide 'mailcap)
 
diff --git a/lisp/mml.el b/lisp/mml.el
index 1d71f4bc3..f5880603a 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -704,25 +704,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 		      "application/octet-stream"))
 	 (string (completing-read
 		  (format "Content type (default %s): " default)
-		  (mapcar
-		   'list
-		   (mm-delete-duplicates
-		    (nconc
-		     (mapcar 'cdr mailcap-mime-extensions)
-		     (apply
-		      'nconc
-		      (mapcar
-		       (lambda (l)
-			 (delq nil
-			       (mapcar
-				(lambda (m)
-				  (let ((type (cdr (assq 'type (cdr m)))))
-				    (if (equal (cadr (split-string type "/"))
-					       "*")
-					nil
-				      type)))
-				(cdr l))))
-		       mailcap-mime-data))))))))
+		  (mapcar 'list (mailcap-mime-types)))))
     (if (not (equal string ""))
 	string
       default)))
-- 
2.34.1