if (c1 == 0
? c2 != 0
: (c2 == 0
- ? !CHAR_COMPONENTS_VALID_P (charset, c1, 0x20)
- : !CHAR_COMPONENTS_VALID_P (charset, c1, c2)))
+ ? !CHAR_COMPONENTS_VALID_P (charset_id, c1, 0x20)
+ : !CHAR_COMPONENTS_VALID_P (charset_id, c1, c2)))
error ("Invalid code points for charset ID %d: %d %d", charset_id, c1, c2);
return make_number (MAKE_CHAR (charset_id, c1, c2));