diff options
| author | Dave Love <fx@gnu.org> | 2000-10-27 22:46:05 +0000 |
|---|---|---|
| committer | Dave Love <fx@gnu.org> | 2000-10-27 22:46:05 +0000 |
| commit | 9b198954f1d22de40393dced81ed039c6f99d4a9 (patch) | |
| tree | cea54908c41de77a46d3433f631c49edf324eedc /lisp/gnus/mailcap.el | |
| parent | 020676925cfa3fee6a016bcbee89635dc647036f (diff) | |
| download | emacs-9b198954f1d22de40393dced81ed039c6f99d4a9.tar.gz | |
2000-10-27 ShengHuo ZHU <zsh@cs.rochester.edu>
* mailcap.el (mailcap-parse-mailcaps): Don't use parse-colon-path,
because they are files, not paths.
(mailcap-parse-mimetypes): Ditto.
(mailcap-mime-types): Use mailcap-mime-data.
Diffstat (limited to 'lisp/gnus/mailcap.el')
| -rw-r--r-- | lisp/gnus/mailcap.el | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el index e913573566f..081cf60d735 100644 --- a/lisp/gnus/mailcap.el +++ b/lisp/gnus/mailcap.el @@ -3,6 +3,7 @@ ;; Author: William M. Perry <wmperry@aventail.com> ;; Lars Magne Ingebrigtsen <larsi@gnus.org> +;; Maintainer: bugs@gnus.org ;; Keywords: news, mail ;; This file is part of GNU Emacs. @@ -357,7 +358,7 @@ MAILCAPS if set; otherwise (on Unix) use the path from RFC 1524, plus "/usr/local/etc/mailcap")))) (let ((fnames (reverse (if (stringp path) - (parse-colon-path path) + (delete "" (split-string path path-separator)) path))) fname) (while fnames @@ -860,7 +861,7 @@ If FORCE, re-parse even if already parsed." "/usr/local/etc/mime-types" "/usr/local/www/conf/mime-types")))) (let ((fnames (reverse (if (stringp path) - (parse-colon-path path) + (delete "" (split-string path path-separator)) path))) fname) (while fnames @@ -937,7 +938,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) |