;;; mh-mime.el --- MH-E MIME support
-;; Copyright (C) 1993, 1995, 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001-2016 Free Software Foundation, Inc.
;; Author: Bill Wohler <wohler@newt.com>
;; Maintainer: Bill Wohler <wohler@newt.com>
(buffer-read-only nil))
(when (string-match "^[^% \t]+$" method)
(setq method (concat method " %s")))
- (mh-cl-flet
+ (mh-flet
((mm-handle-set-external-undisplayer
(handle function)
(mh-handle-set-external-undisplayer folder handle function)))
(let ((handles ())
(folder mh-show-folder-buffer)
(raw-message-data (buffer-string)))
- (mh-cl-flet
+ (mh-flet
((mm-handle-set-external-undisplayer
(handle function)
(mh-handle-set-external-undisplayer folder handle function)))
(function (get-text-property (point) 'mh-callback))
(buffer-read-only nil)
(folder mh-show-folder-buffer))
- (mh-cl-flet
+ (mh-flet
((mm-handle-set-external-undisplayer
(handle function)
(mh-handle-set-external-undisplayer folder handle function)))
(mm-inline-media-tests mh-mm-inline-media-tests)
(data (get-text-property (point) 'mh-data))
(function (get-text-property (point) 'mh-callback)))
- (mh-cl-flet
+ (mh-flet
((mm-handle-set-external-undisplayer
(handle func)
(mh-handle-set-external-undisplayer folder handle func)))
(defun mh-display-emphasis ()
"Display graphical emphasis."
(when (and mh-graphical-emphasis-flag (mh-small-show-buffer-p))
- (mh-cl-flet
+ (mh-flet
((article-goto-body ())) ; shadow this function to do nothing
(save-excursion
(goto-char (point-min))
(defun mh-minibuffer-read-type (filename &optional default)
"Return the content type associated with the given FILENAME.
If the \"file\" command exists and recognizes the given file,
-then its value is returned\; otherwise, the user is prompted for
+then its value is returned; otherwise, the user is prompted for
a type (see `mailcap-mime-types').
Optional argument DEFAULT is returned if a type isn't entered."
(mailcap-parse-mimetypes)
(kill-buffer tmp-buffer)))))))
(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/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/msword" "\\.xls" "application/ms-excel")
+ ("application/msword" "\\.ppt" "application/ms-powerpoint")
+ ("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/x-zip" "\\.ods"
"application/vnd.oasis.opendocument.spreadsheet")
- ("application/x-zip" "\.odt" "application/vnd.oasis.opendocument.text"))
+ ("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
;;;###mh-autoload
(defun mh-have-file-command ()
- "Return t if 'file' command is on the system.
+ "Return t if `file' command is on the system.
'file -i' is used to get MIME type of composition insertion."
(when (eq mh-have-file-command 'undefined)
(setq mh-have-file-command