From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Wed, 27 Jul 2016 09:03:36 +0000 (+0900)
Subject: (Fmake_coding_system): Accept property `charset-g3' for CODESYS_UTF8.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ee6eb6d74c2f99ce044ae4712c54bac44d577a2e;p=chise%2Fxemacs-chise.git

(Fmake_coding_system): Accept property `charset-g3' for CODESYS_UTF8.
(char_encode_utf8): Refer `charset-g3'.
---

diff --git a/src/text-coding.c b/src/text-coding.c
index e6da371..0b6ccfd 100644
--- a/src/text-coding.c
+++ b/src/text-coding.c
@@ -2,7 +2,7 @@
    Copyright (C) 1991, 1995 Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2011,
-     2012, 2013 MORIOKA Tomohiko
+     2012, 2013, 2016 MORIOKA Tomohiko
 
 This file is part of XEmacs.
 
@@ -1079,6 +1079,8 @@ if TYPE is 'ccl:
 	      CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, 1) = value;
 	    else if (EQ (key, Qcharset_g2))
 	      CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, 2) = value;
+	    else if (EQ (key, Qcharset_g3))
+	      CODING_SYSTEM_ISO2022_INITIAL_CHARSET (codesys, 3) = value;
 	    else
 	      signal_simple_error ("Unrecognized property", key);
 	  }
@@ -4825,6 +4827,13 @@ char_encode_utf8 (struct encoding_stream *str, Emchar ch,
 						  map, Qnil,
 						  Qnil, Qnil)) )
 	    code_point = XINT (ret);
+	  else if ( !NILP (map =
+			   CODING_SYSTEM_ISO2022_INITIAL_CHARSET
+			   (str->codesys, 3))
+		    && INTP (ret = Fchar_feature (make_char (ch),
+						  map, Qnil,
+						  Qnil, Qnil)) )
+	    code_point = XINT (ret);
 	  else if (CODING_SYSTEM_USE_ENTITY_REFERENCE (str->codesys))
 	    {
 	      char buf[18];