merge from semi-1_14 branch:
authoryoichi <yoichi>
Sun, 4 Apr 2004 11:25:31 +0000 (11:25 +0000)
committeryoichi <yoichi>
Sun, 4 Apr 2004 11:25:31 +0000 (11:25 +0000)
commit83e50bc819e005ce5bb8fddb94ab01bd11b2e574
tree3e2b97f1dc23b65368fcb9f3da59e0fe6480efe4
parent930b8862d45c81981f94debdd9edcafccc17d93e
merge from semi-1_14 branch:
* mime-edit.el (mime-file-types): Add application/vnd.ms-excel.
(mime-content-types): Add application/vnd.ms-excel and
application/msword.
* mime-image.el (mime-display-image): Ignore errors about image
decoding.
ChangeLog
mime-edit.el
mime-image.el