# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 973105185 0
# Node ID 4e779ba474ee49e6d1f73faa9f119a95fda5a7bf
# Parent  18591e92c712a5ae487c316ea8a534d33075b409
(mml-parse-1): Clarify message.
(mml-minibuffer-read-type): Use mailcap-mime-types.

diff -r 18591e92c712 -r 4e779ba474ee lisp/gnus/mml.el
--- a/lisp/gnus/mml.el	Wed Nov 01 16:27:08 2000 +0000
+++ b/lisp/gnus/mml.el	Wed Nov 01 18:59:45 2000 +0000
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;; Maintainer: bugs@gnus.org
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -132,7 +133,7 @@
 	(when (and (not raw) (memq nil charsets))
 	  (if (or (memq 'unknown-encoding mml-confirmation-set)
 		  (y-or-n-p
-		   "Warning: You message contains characters with unknown encoding. Really send?"))
+		   "Message contains characters with unknown encoding.  Really send?"))
 	      (if (setq use-ascii 
 			(or (memq 'use-ascii mml-confirmation-set)
 			    (y-or-n-p "Use ASCII as charset?")))
@@ -704,25 +705,7 @@
 		      "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)))