(decode_defined_char): Add new argument `without_inheritance'.

(DECODE_CHAR): Likewise.
(MAKE_CHAR): Modify for `DECODE_CHAR'.

diff --git a/src/char-ucs.h b/src/char-ucs.h
index 8e739b4..9f22a62 100644 (file)
--- a/src/char-ucs.h
+++ b/src/char-ucs.h
@@ -641,13 +641,16 @@ decoding_table_remove_char (Lisp_Object ccs, int code_point)
 Emchar load_char_decoding_entry_maybe (Lisp_Object ccs, int code_point);
 #endif
 
-Emchar decode_defined_char (Lisp_Object charset, int code_point);
+Emchar decode_defined_char (Lisp_Object charset, int code_point,
+                           int without_inheritance);
 
-INLINE_HEADER Emchar DECODE_CHAR (Lisp_Object charset, int code_point);
 INLINE_HEADER Emchar
-DECODE_CHAR (Lisp_Object charset, int code_point)
+DECODE_CHAR (Lisp_Object charset, int code_point, int without_inheritance);
+INLINE_HEADER Emchar
+DECODE_CHAR (Lisp_Object charset, int code_point, int without_inheritance)
 {
-  Emchar char_id = decode_defined_char (charset, code_point);
+  Emchar char_id
+    = decode_defined_char (charset, code_point, without_inheritance);
 
   if (char_id >= 0)
     return char_id;
@@ -663,9 +666,9 @@ INLINE_HEADER Emchar
 MAKE_CHAR (Lisp_Object charset, int c1, int c2)
 {
   if (XCHARSET_DIMENSION (charset) == 1)
-    return DECODE_CHAR (charset, c1);
+    return DECODE_CHAR (charset, c1, 0);
   else
-    return DECODE_CHAR (charset, (c1 << 8) | c2);
+    return DECODE_CHAR (charset, (c1 << 8) | c2, 0);
 }
 
 extern Lisp_Object Vcharacter_attribute_table;