From: yamaoka <yamaoka>
Date: Wed, 19 Apr 2000 22:06:41 +0000 (+0000)
Subject: Sync with latest Gnus.
X-Git-Tag: t-gnus-6_14-quimby-before-AC-changed-~121
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5af0a0e9ceb0ecc204b570c4450cf39fc89aefb0;p=elisp%2Fgnus.git-

Sync with latest Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0d44718..129fe0d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-19  Dave Love  <fx@gnu.org>
+
+	* mailcap.el (mailcap-parse-mimetypes): Add ...mime.types.
+
 2000-04-18 12:28:24  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
 	* nnwarchive.el (nnwarchive-type-definition): New egroups html.
diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el
index 4595ce7..f4c6be8 100644
--- a/lisp/gnus-mailcap.el
+++ b/lisp/gnus-mailcap.el
@@ -801,11 +801,21 @@ this type is returned."
    ((memq system-type '(ms-dos ms-windows windows-nt))
     (setq path (mapconcat 'expand-file-name
 			  '("~/mime.typ" "~/etc/mime.typ") ";")))
-   (t (setq path (mapconcat 'expand-file-name
-			    '("~/.mime-types"
-			      "/etc/mime-types:/usr/etc/mime-types"
-			      "/usr/local/etc/mime-types"
-			      "/usr/local/www/conf/mime-types") ":"))))
+   (t (setq path (mapconcat
+		  'expand-file-name
+		  ;; mime.types seems to be the normal name,
+		  ;; definitely so on current GNUish systems.  The
+		  ;; ordering follows that for mailcap.
+		  '("~/.mime.types"
+		    "/etc/mime.types"
+		    "/usr/etc/mime.types"
+		    "/usr/local/etc/mime.types"
+		    "/usr/local/www/conf/mime.types"
+		    "~/.mime-types"
+		    "/etc/mime-types"
+		    "/usr/etc/mime-types"
+		    "/usr/local/etc/mime-types"
+		    "/usr/local/www/conf/mime-types") ":"))))
   (let ((fnames (reverse
 		 (split-string path
 			       (if (memq system-type