tm 7.80.

[elisp/tm.git] / tm-rich.el

diff --git a/tm-rich.el b/tm-rich.el
index 48c8ee1..447f61b 100644 (file)
--- a/tm-rich.el
+++ b/tm-rich.el
@@ -3,29 +3,34 @@
 ;;;                richtext filter for tm-view
 ;;;
 ;;; Copyright (C) 1995 Free Software Foundation, Inc.
-;;; Copyright (C) 1994,1995 MORIOKA Tomohiko
+;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Version:
-;;;    $Id: tm-rich.el,v 7.0 1995/10/04 05:27:50 morioka Exp $
+;;;    $Id: tm-rich.el,v 7.5 1996/05/07 06:28:36 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, richtext, enriched
 ;;;
 ;;; This file is part of tm (Tools for MIME).
 ;;;
+;;; This program is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU General Public License as
+;;; published by the Free Software Foundation; either version 2, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with This program.  If not, write to the Free Software
+;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;;
+;;; Code:
 
 (require 'tm-view)
 
 
-(defvar tm-rich/richtext-module
-  (if (or (< emacs-major-version 19)
-         (and (= emacs-major-version 19)
-              (< emacs-minor-version 29))
-         )
-      'tinyrich
-    'richtext))
-(require tm-rich/richtext-module)
-
-
 ;;; @ content filters for tm-view
 ;;;
 
@@ -38,13 +43,7 @@
         (beg (point-min)) (end (point-max))
         )
     (remove-text-properties beg end '(face nil))
-    (cond ((string= encoding "quoted-printable")
-          (quoted-printable-decode-region beg end)
-          )
-         ((string= encoding "base64")
-          (base64-decode-region beg end)
-          ))
-    ;; end
+    (mime/decode-region encoding beg end)
     (if (and m (fboundp (setq m (cdr m))))
        (funcall m beg (point-max) charset encoding)
       (mime-viewer/default-code-convert-region beg (point-max)
@@ -62,13 +61,7 @@
         (beg (point-min)) (end (point-max))
         )
     (remove-text-properties beg end '(face nil))
-    (cond ((string= encoding "quoted-printable")
-          (quoted-printable-decode-region beg end)
-          )
-         ((string= encoding "base64")
-          (base64-decode-region beg end)
-          ))
-    ;; end
+    (mime/decode-region encoding beg end)
     (if (and m (fboundp (setq m (cdr m))))
        (funcall m beg (point-max) charset encoding)
       (mime-viewer/default-code-convert-region beg (point-max)
@@ -94,3 +87,5 @@
 (provide 'tm-rich)
 
 (run-hooks 'tm-rich-load-hook)
+
+;;; tm-rich.el ends here