aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/mh-e/ChangeLog3
-rw-r--r--lisp/mh-e/mh-mime.el3
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index ed5c0818ebc..94e96e66d83 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,5 +1,8 @@
12006-02-27 Bill Wohler <wohler@newt.com> 12006-02-27 Bill Wohler <wohler@newt.com>
2 2
3 * mh-mime.el (mh-minibuffer-read-type): Deleted comment in
4 docstring about obsolete variable mh-mime-content-types.
5
3 * mh-e.el (mh-variant): Sync docstring with manual. 6 * mh-e.el (mh-variant): Sync docstring with manual.
4 (cus-face): Require as it is needed by mh-inherit-face-flag. 7 (cus-face): Require as it is needed by mh-inherit-face-flag.
5 8
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 4b0ce65cf5d..d35e759bcd4 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1689,8 +1689,7 @@ buffer, while END defaults to the the end of the buffer."
1689 "Return the content type associated with the given FILENAME. 1689 "Return the content type associated with the given FILENAME.
1690If the \"file\" command exists and recognizes the given file, 1690If the \"file\" command exists and recognizes the given file,
1691then its value is returned\; otherwise, the user is prompted for 1691then its value is returned\; otherwise, the user is prompted for
1692a type (see `mailcap-mime-types' and for Emacs 20, 1692a type (see `mailcap-mime-types').
1693`mh-mime-content-types').
1694Optional argument DEFAULT is returned if a type isn't entered." 1693Optional argument DEFAULT is returned if a type isn't entered."
1695 (mailcap-parse-mimetypes) 1694 (mailcap-parse-mimetypes)
1696 (let* ((default (or default 1695 (let* ((default (or default