tm 7.39.

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

diff --git a/tm-rich.el b/tm-rich.el
index 6968a31..398b60d 100644 (file)
--- a/tm-rich.el
+++ b/tm-rich.el
@@ -7,7 +7,7 @@
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Version:
-;;;    $Id: tm-rich.el,v 6.14 1995/09/21 00:18:32 morioka Exp $
+;;;    $Id: tm-rich.el,v 7.1 1995/10/20 10:40:06 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, richtext, enriched
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -15,6 +15,7 @@
 
 (require 'tm-view)
 
+
 (defvar tm-rich/richtext-module
   (if (or (< emacs-major-version 19)
          (and (= emacs-major-version 19)
@@ -32,18 +33,12 @@
   (let* ((mode mime::preview/original-major-mode)
         (m (assq mode mime-viewer/code-converter-alist))
         (charset (assoc "charset" params))
-        ;; 1995/9/21
+        ;; 1995/9/21 (c.f. tm-eng:105), 1995/10/3 (c.f. tm-eng:121)
         ;;   modified by Eric Ding <ericding@San-Jose.ate.slb.com>
-        ;;   (c.f. tm-eng:105)
         (beg (point-min)) (end (point-max))
         )
-    (cond ((string= encoding "quoted-printable")
-          (quoted-printable-decode-region beg end)
-          )
-         ((string= encoding "base64")
-          (base64-decode-region beg end)
-          ))
-    ;; end
+    (remove-text-properties beg end '(face nil))
+    (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)
@@ -56,18 +51,12 @@
   (let* ((mode mime::preview/original-major-mode)
         (m (assq mode mime-viewer/code-converter-alist))
         (charset (assoc "charset" params))
-        ;; 1995/9/21
+        ;; 1995/9/21 (c.f. tm-eng:105), 1995/10/3 (c.f. tm-eng:121)
         ;;   modified by Eric Ding <ericding@San-Jose.ate.slb.com>
-        ;;   (c.f. tm-eng:105)
         (beg (point-min)) (end (point-max))
         )
-    (cond ((string= encoding "quoted-printable")
-          (quoted-printable-decode-region beg end)
-          )
-         ((string= encoding "base64")
-          (base64-decode-region beg end)
-          ))
-    ;; end
+    (remove-text-properties beg end '(face nil))
+    (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)
@@ -87,6 +76,9 @@
           "text/enriched" (function mime-viewer/filter-text/enriched))
 
 
-(run-hooks 'tm-rich-load-hook)
+;;; @ end
+;;;
 
 (provide 'tm-rich)
+
+(run-hooks 'tm-rich-load-hook)