From: Kenichi Handa <handa@m17n.org>
Date: Sat, 11 Jan 2003 03:39:02 +0000 (+0000)
Subject: (ENCODE_CHAR): If the method is SUBSET or SUPERSET, call encode_char.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~101
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a02732df6f6e1cd508b618c7f244f139869d14a;p=emacs.git

(ENCODE_CHAR): If the method is SUBSET or SUPERSET, call encode_char.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b7b3e86a00f..aa77e0b28eb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2003-01-11  Kenichi Handa  <handa@m17n.org>
 
+	* charset.h (ENCODE_CHAR): If the method is SUBSET or SUPERSET,
+	call encode_char.
+
+	* charset.c (encode_char): Fix handling of methods SUBSET and
+	SUPERSET.
+
 	* xterm.c (x_new_fontset): Fix previous change.
 
 2003-01-10  Dave Love  <fx@gnu.org>
diff --git a/src/charset.h b/src/charset.h
index dd8a872a328..6db0165274a 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -421,7 +421,9 @@ extern Lisp_Object charset_work;
 #define ENCODE_CHAR(charset, c)						 \
   ((ASCII_CHAR_P (c) && (charset)->ascii_compatible_p)			 \
    ? (c)								 \
-   : (charset)->unified_p						 \
+   : ((charset)->unified_p						 \
+      || (charset)->method == CHARSET_METHOD_SUBSET			 \
+      || (charset)->method == CHARSET_METHOD_SUPERSET)			 \
    ? encode_char ((charset), (c))					 \
    : ((c) < (charset)->min_char || (c) > (charset)->max_char)		 \
    ? (charset)->invalid_code						 \