Mercurial > hg > xemacs-beta

diff lisp/w3/mm.el @ 134:34a5b81f86ba r20-2b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-2b1
author cvs
date Mon, 13 Aug 2007 09:30:11 +0200
parents d2f30a177268
children 6608ceec7cf8
line wrap: on
line diff
--- a/lisp/w3/mm.el	Mon Aug 13 09:29:37 2007 +0200
+++ b/lisp/w3/mm.el	Mon Aug 13 09:30:11 2007 +0200
@@ -427,14 +427,15 @@
    ((memq system-type '(ms-dos ms-windows windows-nt))
     (setq path (mapconcat 'expand-file-name '("~/mail.cap" "~/etc/mail.cap")
 			  ";")))
-   (t (setq path (concat "/etc/mailcap:/usr/etc/mailcap:"
-			 "/usr/local/etc/mailcap:"
-			 (expand-file-name "~/.mailcap")))))
+   (t (setq path (mapconcat 'expand-file-name
+			    '("~/.mailcap"
+			      "/etc/mailcap:/usr/etc/mailcap"
+			      "/usr/local/etc/mailcap") ":"))))
   (let ((fnames (reverse
 		 (mm-string-to-tokens path
 				      (if (memq system-type
 						'(ms-dos ms-windows windows-nt))
-					  ? ;
+					  ?;
 					?:))))
 	fname)
     (while fnames
@@ -973,15 +974,16 @@
    ((memq system-type '(ms-dos ms-windows windows-nt))
     (setq path (mapconcat 'expand-file-name
 			  '("~/mime.typ" "~/etc/mime.typ") ";")))
-   (t (setq path (concat (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"
+			      "/etc/mime-types:/usr/etc/mime-types"
+			      "/usr/local/etc/mime-types"
+			      "/usr/local/www/conf/mime-types") ":"))))
   (let ((fnames (reverse
 		 (mm-string-to-tokens path
 				      (if (memq system-type
 						'(ms-dos ms-windows windows-nt))
-					  ? ;
+					  ?;
 					?:))))
 	fname)
     (while fnames