diff options
Diffstat (limited to 'lisp/mh-e')
| -rw-r--r-- | lisp/mh-e/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/mh-e/mh-e.el | 7 | ||||
| -rw-r--r-- | lisp/mh-e/mh-mime.el | 14 |
3 files changed, 30 insertions, 4 deletions
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 8d8b64c75fb..47c7808f192 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,14 @@ +2006-02-04 Bill Wohler <wohler@newt.com> + + * mh-e.el (mh-inc-spool-list): Update example for Emacs 22 which + has an emacsclient command that supports --eval. I had read that + gnudoit was deprecated in favor of gnuclient anyway. + +2006-02-04 Eric Ding <ericding@alum.mit.edu> + + * mh-mime.el (mh-file-mime-type-substitutions): Added entries to + handle OpenOffice documents. + 2006-02-03 Bill Wohler <wohler@newt.com> * mh-e.el (Version, mh-version): Add +cvs to version. @@ -19,7 +30,7 @@ 88) with (min-colors 64) in face specifications so that MH-E still looks good on systems with fewer colors (such as Eric Ding's). -2006-02-03 Peter Galbraith <psg@debian.org> +2006-02-03 Peter S Galbraith <psg@debian.org> * mh-utils.el (mh-image-load-path): New variable to optionally hold the directory where MH-E images are stored. If nil, then diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 9be827a8071..8012eab5c8a 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -1521,14 +1521,17 @@ on the \"INS\" button. Enter a \"Spool File\" of \"~/mail/mh-e\", a \"Folder\" of \"mh-e\", and a \"Key Binding\" of \"m\". You can use \"xbuffy\" to automate the incorporation of this mail -using the \"gnudoit\" command in the \"gnuserv\" package as follows: +using the Emacs 22 command \"emacsclient\" as follows: box ~/mail/mh-e title mh-e origMode polltime 10 headertime 0 - command gnudoit -q '(mh-inc-spool-mh-e)'" + command emacsclient --eval '(mh-inc-spool-mh-e)' + +In XEmacs, the command \"gnuclient\" is used in a similar +fashion." :type '(repeat (list (file :tag "Spool File") (string :tag "Folder") (character :tag "Key Binding"))) diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 787f5c371fe..b35b1e6aace 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -1733,7 +1733,19 @@ Returns nil if file command not on system." (defvar mh-file-mime-type-substitutions '(("application/msword" "\.xls" "application/ms-excel") ("application/msword" "\.ppt" "application/ms-powerpoint") - ("text/plain" "\.vcf" "text/x-vcard")) + ("text/plain" "\.vcf" "text/x-vcard") + ("text/rtf" "\.rtf" "application/rtf") + ("application/x-zip" "\.sxc" "application/vnd.sun.xml.calc") + ("application/x-zip" "\.sxd" "application/vnd.sun.xml.draw") + ("application/x-zip" "\.sxi" "application/vnd.sun.xml.impress") + ("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/vnd.oasis.opendocument.presentation") + ("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. The first element is the Content-Type returned by the file command. The second element is a regexp matching the file name, usually the |