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

Import from CVS: tag r20-2b1
author cvs
date Mon, 13 Aug 2007 09:30:11 +0200
parents d2f30a177268
children 6608ceec7cf8
comparison
equal deleted inserted replaced
133:b27e67717092 134:34a5b81f86ba
425 (path nil) 425 (path nil)
426 ((getenv "MAILCAPS") (setq path (getenv "MAILCAPS"))) 426 ((getenv "MAILCAPS") (setq path (getenv "MAILCAPS")))
427 ((memq system-type '(ms-dos ms-windows windows-nt)) 427 ((memq system-type '(ms-dos ms-windows windows-nt))
428 (setq path (mapconcat 'expand-file-name '("~/mail.cap" "~/etc/mail.cap") 428 (setq path (mapconcat 'expand-file-name '("~/mail.cap" "~/etc/mail.cap")
429 ";"))) 429 ";")))
430 (t (setq path (concat "/etc/mailcap:/usr/etc/mailcap:" 430 (t (setq path (mapconcat 'expand-file-name
431 "/usr/local/etc/mailcap:" 431 '("~/.mailcap"
432 (expand-file-name "~/.mailcap"))))) 432 "/etc/mailcap:/usr/etc/mailcap"
433 "/usr/local/etc/mailcap") ":"))))
433 (let ((fnames (reverse 434 (let ((fnames (reverse
434 (mm-string-to-tokens path 435 (mm-string-to-tokens path
435 (if (memq system-type 436 (if (memq system-type
436 '(ms-dos ms-windows windows-nt)) 437 '(ms-dos ms-windows windows-nt))
437 ? ; 438 ?;
438 ?:)))) 439 ?:))))
439 fname) 440 fname)
440 (while fnames 441 (while fnames
441 (setq fname (car fnames)) 442 (setq fname (car fnames))
442 (if (and (file-exists-p fname) (file-readable-p fname)) 443 (if (and (file-exists-p fname) (file-readable-p fname))
971 (path nil) 972 (path nil)
972 ((getenv "MIMETYPES") (setq path (getenv "MIMETYPES"))) 973 ((getenv "MIMETYPES") (setq path (getenv "MIMETYPES")))
973 ((memq system-type '(ms-dos ms-windows windows-nt)) 974 ((memq system-type '(ms-dos ms-windows windows-nt))
974 (setq path (mapconcat 'expand-file-name 975 (setq path (mapconcat 'expand-file-name
975 '("~/mime.typ" "~/etc/mime.typ") ";"))) 976 '("~/mime.typ" "~/etc/mime.typ") ";")))
976 (t (setq path (concat (expand-file-name "~/.mime-types") ":" 977 (t (setq path (mapconcat 'expand-file-name
977 "/etc/mime-types:/usr/etc/mime-types:" 978 '("~/.mime-types"
978 "/usr/local/etc/mime-types:" 979 "/etc/mime-types:/usr/etc/mime-types"
979 "/usr/local/www/conf/mime-types")))) 980 "/usr/local/etc/mime-types"
981 "/usr/local/www/conf/mime-types") ":"))))
980 (let ((fnames (reverse 982 (let ((fnames (reverse
981 (mm-string-to-tokens path 983 (mm-string-to-tokens path
982 (if (memq system-type 984 (if (memq system-type
983 '(ms-dos ms-windows windows-nt)) 985 '(ms-dos ms-windows windows-nt))
984 ? ; 986 ?;
985 ?:)))) 987 ?:))))
986 fname) 988 fname)
987 (while fnames 989 (while fnames
988 (setq fname (car fnames)) 990 (setq fname (car fnames))
989 (if (and (file-exists-p fname) (file-readable-p fname)) 991 (if (and (file-exists-p fname) (file-readable-p fname))