tm 6.78.2.

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

diff --git a/tm-mule.el b/tm-mule.el
index dfc6241..420d7e6 100644 (file)
--- a/tm-mule.el
+++ b/tm-mule.el
@@ -1,20 +1,15 @@
 ;;;
-;;; $Id: tm-mule.el,v 5.4 1995/04/20 13:57:31 morioka Exp $
+;;; $Id: tm-mule.el,v 6.4 1995/08/27 13:33:13 morioka Exp $
 ;;;
 
-(provide 'tm-mule)
-
+(require 'emu)
 (require 'tl-list)
-(require 'tl-mule)
 
-(if (not (fboundp 'member))
-    (require 'tl-18)
-  )
 
 ;;; @ variables
 ;;;
 
-(defvar mime/default-charset *ctext*)
+(defvar mime/default-coding-system *ctext*)
 
 (defvar mime/lc-charset-and-encoding-alist
   (list
@@ -51,6 +46,7 @@
     ("ISO-8859-7"      . *iso-8859-7*)
     ("ISO-8859-8"      . *iso-8859-8*)
     ("ISO-8859-9"      . *iso-8859-9*)
+    ("ISO-2022-INT-1"  . *iso-2022-int-1*)
     ))
 
 (defvar mime/charset-lc-alist
@@ -69,6 +65,7 @@
 
 ;;; @ define charset and encoding
 ;;;
+
 (defun mime/set-charset-and-encoding (lc cs charset encoding)
   (setq mime/lc-charset-and-encoding-alist
        (put-alist lc (cons charset encoding)
@@ -140,19 +137,8 @@
               (mime/remove-leading-character str)
             str)))))
 
-;; by mol. 1993/10/4
-(defun mime/decode-encoded-text (charset encoding str)
-  (mime/convert-string-to-emacs
-   charset
-   (cond ((string-match "^B$" encoding)
-         (mime/base64-decode-string str))
-        ((string-match "^Q$" encoding)
-         (mime/Quoted-Printable-decode-string str))
-        (t (message "unknown encoding %s" encoding) str)
-        )))
 
-
-(defun mime/code-convert-region-to-emacs (beg end charset)
+(defun mime/code-convert-region-to-emacs (beg end charset &optional encoding)
   (if (stringp charset)
       (progn
        (setq charset (upcase charset))
@@ -160,6 +146,14 @@
          (if ct
              (code-convert beg end ct *internal*)
            )))
-    (if mime/default-charset
-       (code-convert beg end mime/default-charset *internal*)
+    (if mime/default-coding-system
+       (code-convert beg end mime/default-coding-system *internal*)
       )))
+
+
+;;; @ end
+;;;
+
+(provide 'tm-mule)
+
+(run-hooks 'tm-mule-load-hook)