Remove msword code. mailcap is good enough.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c522fe..7b783c2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,14 +1,8 @@
 2002-02-18  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
-       * mm-decode.el (mm-application-msword-renderer): New variable.
-       (mm-inline-media-tests): Use it.
-       (mm-inlined-types): Add application/msword.
-
        * mm-view.el (mm-inline-render-with-file): With unibyte buffer.
        (mm-inline-render-with-stdin): Ditto.
        (mm-inline-render-with-function): Ditto.
-       (mm-application-msword-renderer-alist): New variable.
-       (mm-inline-application-msword): New function.
        (mm-inline-wash-with-file): Bind coding-system-for-write.
        (mm-inline-wash-with-stdin): Ditto.
 

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 4be1050..d80fde0 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -107,22 +107,13 @@ The defined renderer types are:
 `w3'   : using Emacs/W3;
 `w3m'  : using emacs-w3m;
 `links': using links;
-`lynx' : using lynx."
+`lynx' : using lynx;
+`nil'  : using external viewer."
   :type '(choice (symbol w3)
                 (symbol w3m)
                 (symbol links)
                 (symbol lynx)
-                (function))
-  :version "21.3"
-  :group 'mime-display)
-
-(defcustom mm-application-msword-renderer
-  (cond ((executable-find "catdoc") 'catdoc))
-  "Render of application/msword contents.
-It is one of defined renderer types, or a rendering function.
-The defined renderer types are:
-`catdoc' : using catdoc."
-  :type '(choice (symbol catdoc)
+                (symbol nil)
                 (function))
   :version "21.3"
   :group 'mime-display)
@@ -205,10 +196,6 @@ images, however this behavior may be changed in the future."
      (lambda (handle)
        (or (featurep 'vcard)
           (locate-library "vcard"))))
-    ("application/msword"
-     mm-inline-application-msword
-     (lambda (handle)
-       mm-application-msword-renderer))
     ("message/delivery-status" mm-inline-text identity)
     ("message/rfc822" mm-inline-message identity)
     ("message/partial" mm-inline-partial identity)
@@ -247,7 +234,7 @@ images, however this behavior may be changed in the future."
     "message/partial" "message/external-body" "application/emacs-lisp"
     "application/pgp-signature" "application/x-pkcs7-signature"
     "application/pkcs7-signature" "application/x-pkcs7-mime"
-    "application/pkcs7-mime" "application/msword")
+    "application/pkcs7-mime")
   "List of media types that are to be displayed inline.
 See also `mm-inline-media-tests', which says how to display a media
 type inline."

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index ad7dfeb..64f3ab4 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -57,10 +57,6 @@
           "lynx" "-dump" "-force_html" "-stdin"))
   "The attributes of washer types for text/html.")
 
-(defvar mm-application-msword-renderer-alist
-  '((catdoc  mm-inline-render-with-stdin nil "catdoc"))
-  "The attributes of renderer types.")
-
 ;;; Internal variables.
 
 ;;;
@@ -592,18 +588,6 @@ will not be substituted.")
                       (and (listp (car-safe smime-keys))
                            (caar smime-keys)))))))
 
-(defun mm-inline-application-msword (handle)
-  (let* ((func mm-application-msword-renderer)
-        (entry (assq func mm-application-msword-renderer-alist))
-        buffer-read-only)
-    (if entry
-       (setq func (cdr entry)))
-    (cond
-     ((gnus-functionp func)
-      (funcall func handle))
-     (t
-      (apply (car func) handle (cdr func))))))
-
 (provide 'mm-view)
 
 ;;; mm-view.el ends here