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

[elisp/tm.git] / tm-ew-e.el

diff --git a/tm-ew-e.el b/tm-ew-e.el
index 255b569..afb1fac 100644 (file)
--- a/tm-ew-e.el
+++ b/tm-ew-e.el
@@ -1,10 +1,10 @@
-;;; tm-ew-e.el --- RFC 1522 based MIME encoded-word encoder for GNU Emacs
+;;; tm-ew-e.el --- RFC 2047 based encoded-word encoder for GNU Emacs
 
-;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Revision: 7.54 $
-;; Keywords: mail, news, MIME, RFC 1522, multilingual, encoded-word
+;; Version: $Revision: 7.58 $
+;; Keywords: encoded-word, MIME, multilingual, header, mail, news
 
 ;; This file is part of tm (Tools for MIME).
 
@@ -19,8 +19,8 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
@@ -35,7 +35,7 @@
 ;;;
 
 (defconst tm-ew-e/RCS-ID
-  "$Id: tm-ew-e.el,v 7.54 1996/09/16 08:59:18 morioka Exp $")
+  "$Id: tm-ew-e.el,v 7.58 1997/02/11 10:49:13 morioka Exp $")
 (defconst mime-eword/encoder-version (get-version-string tm-ew-e/RCS-ID))
 
 
@@ -90,11 +90,15 @@ when Subject field is encoded by `mime/encode-message-header'.
     (iso-8859-9                . "Q")
     (iso-2022-jp       . "B")
     (iso-2022-kr       . "B")
+    (gb2312            . "B")
+    (cn-gb             . "B")
+    (cn-gb-2312                . "B")
     (euc-kr            . "B")
     (iso-2022-jp-2     . "B")
     (iso-2022-int-1    . "B")
     ))
 
+
 ;;; @ encoded-text encoder
 ;;;
 
@@ -312,8 +316,7 @@ when Subject field is encoded by `mime/encode-message-header'.
             )
            (t
             (setq string (car rword))
-            (let* ((sl (length string))
-                   (p 0) np
+            (let* ((p 0) np
                    (str "") nstr)
               (while (and (< p len)
                           (progn
@@ -414,7 +417,7 @@ when Subject field is encoded by `mime/encode-message-header'.
                   (append dest
                           (list
                            (let ((ret (tm-eword::find-charset-rule
-                                       (find-charset-string str))))
+                                       (find-non-ascii-charset-string str))))
                              (tm-eword::make-rword
                               str (car ret)(nth 1 ret) 'phrase)
                              )
@@ -552,7 +555,7 @@ when Subject field is encoded by `mime/encode-message-header'.
          (setq beg (match-beginning 0))
          (setq field-name (buffer-substring beg (1- (match-end 0))))
          (setq end (std11-field-end))
-         (and (find-charset-region beg end)
+         (and (find-non-ascii-charset-region beg end)
               (let ((ret (or (ASSOC (downcase field-name)
                                     mime/field-encoding-method-alist
                                     :test (function