Mercurial > emacs
diff lisp/mh-e/mh-mime.el @ 90299:9e490faa9f6b
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-17
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 85-96)
- Update from CVS
- Merge from erc--emacs--0
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 30-36)
- Merge from emacs--devo--0
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 17 Feb 2006 09:10:23 +0000 |
| parents | c5406394f567 bbac579a3af5 |
| children | 5754737d1e04 |
line wrap: on
line diff
--- a/lisp/mh-e/mh-mime.el Wed Feb 15 00:49:52 2006 +0000 +++ b/lisp/mh-e/mh-mime.el Fri Feb 17 09:10:23 2006 +0000 @@ -1741,9 +1741,9 @@ ("application/x-zip" "\.sxw" "application/vnd.sun.xml.writer") ("application/x-zip" "\.odg" "application/vnd.oasis.opendocument.graphics") ("application/x-zip" "\.odi" "application/vnd.oasis.opendocument.image") - ("application/x-zip" "\.odp" + ("application/x-zip" "\.odp" "application/vnd.oasis.opendocument.presentation") - ("application/x-zip" "\.ods" + ("application/x-zip" "\.ods" "application/vnd.oasis.opendocument.spreadsheet") ("application/x-zip" "\.odt" "application/vnd.oasis.opendocument.text")) "Substitutions to make for Content-Type returned from file command.