tm 7.60.

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

diff --git a/tm-def.el b/tm-def.el
index d554a8b..576899f 100644 (file)
--- a/tm-def.el
+++ b/tm-def.el
@@ -6,7 +6,7 @@
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Version:
-;;;    $Id: tm-def.el,v 7.36 1996/04/27 15:30:29 morioka Exp $
+;;;    $Id: tm-def.el,v 7.42 1996/05/09 18:24:39 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, definition
 ;;;
 ;;; This file is part of tm (Tools for MIME).
@@ -203,34 +203,34 @@
 
 (defvar mime/default-coding-system *ctext*)
 
-(defun mime/convert-string-to-emacs (str charset)
+(defun mime-charset-encode-string (str charset)
   (let ((cs (assoc charset mime/charset-coding-system-alist)))
     (if cs
-       (decode-coding-string str (cdr cs))
+       (character-encode-string str (cdr cs))
       )))
 
-(defun mime/convert-string-from-emacs (str charset)
+(defun mime-charset-decode-string (str charset)
   (let ((cs (assoc charset mime/charset-coding-system-alist)))
     (if cs
-       (encode-coding-string str (cdr cs))
+       (character-decode-string str (cdr cs))
       )))
 
-(defun mime/code-convert-region-to-emacs (beg end charset &optional encoding)
+(defun mime-charset-encode-region (beg end charset &optional encoding)
   (let ((ct
         (if (stringp charset)
             (cdr (assoc (upcase charset) mime/charset-coding-system-alist))
           mime/default-coding-system)))
     (if ct
-       (decode-coding-region beg end ct)
+       (character-encode-region beg end ct)
       )))
 
-(defun mime/code-convert-region-from-emacs (beg end charset &optional encoding)
+(defun mime-charset-decode-region (beg end charset &optional encoding)
   (let ((ct
         (if (stringp charset)
             (cdr (assoc (upcase charset) mime/charset-coding-system-alist))
           mime/default-coding-system)))
     (if ct
-       (encode-coding-region beg end ct)
+       (character-decode-region beg end ct)
       )))