This commit was generated by cvs2svn to compensate for changes in r509,

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

diff --git a/tm-nemacs.el b/tm-nemacs.el
index 32052c1..aad2249 100644 (file)
--- a/tm-nemacs.el
+++ b/tm-nemacs.el
@@ -2,15 +2,30 @@
 ;;; tm-nemacs.el --- tm definitions depended on NEmacs
 ;;;
 ;;; Copyright (C) 1995 Free Software Foundation, Inc.
-;;; Copyright (C) 1994,1995 MORIOKA Tomohiko
+;;; Copyright (C) 1994,1995,1996 MORIOKA Tomohiko
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;;; Version:
-;;;    $Id: tm-nemacs.el,v 7.1 1995/10/03 04:51:07 morioka Exp $
+;;;    $Id: tm-nemacs.el,v 7.6 1996/01/11 05:12:50 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia, multilingual, encoded-word
 ;;;
 ;;; 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 'emu)
 
@@ -20,22 +35,13 @@
 
 (defvar mime/default-coding-system *junet*)
 
-(defvar mime/lc-charset-rule-list
+(defvar mime/lc-charset-alist
   (list
-   (list (list lc-ascii)       "US-ASCII"    nil)
-   (list (list lc-ascii lc-jp) "ISO-2022-JP" "B")
+   (cons (list lc-ascii)       "US-ASCII")
+   (cons (list lc-ascii lc-jp) "ISO-2022-JP")
    ))
 
-
-;;; @@ (obsolete)
-;;;
-
-(defvar mime/lc-charset-and-encoding-alist
-  (list (cons lc-ascii nil)
-       (cons lc-jp '("ISO-2022-JP" . "B"))
-       ))
-
-(defvar mime/latin-lc-list (list lc-ascii))
+(defvar mime/unknown-charset "ISO-2022-JP")
 
 
 ;;; @ functions
@@ -43,7 +49,7 @@
 
 (defun mime/convert-string-to-emacs (charset str)
   (cond ((string= "ISO-2022-JP" charset)
-        (convert-string-kanji-code str *junet* *internal*))
+        (code-convert-string str *junet* *internal*))
        ((string= "US-ASCII" charset) str)
        ((string-match "^ISO-8859-[1-9]$" charset)
         (check-ASCII-string str))
@@ -60,7 +66,7 @@
       (progn
        (setq charset (upcase charset))
        (if (string= charset "ISO-2022-JP")
-           (convert-region-kanji-code beg end *junet* *internal*)
+           (code-convert-region beg end *junet* *internal*)
          ))))
 
 
@@ -70,3 +76,5 @@
 (provide 'tm-nemacs)
 
 (run-hooks 'tm-nemacs-load-hook)
+
+;;; tm-nemacs.el ends here