(LEADING_BYTE_COMPOSITE): Deleted.
(LEADING_BYTE_*): Changed in UTF2000.
(NUM_LEADING_BYTES): Changed from 128 to 256.
(LEADING_BYTE_PRIVATE_P): Don't define in UTF2000.
(CHARSET_PRIVATE_P): Likewise.
(XCHARSET_PRIVATE_P): Likewise.
(REP_BYTES_BY_FIRST_BYTE): Change order of condition.
(FIELD1_TO_PRIVATE_LEADING_BYTE): Change value to 0x80 in UTF2000.
(FIELD1_TO_OFFICIAL_LEADING_BYTE): Change value to 0x80 in UTF2000.
(FIELD2_TO_PRIVATE_LEADING_BYTE): Change value to 0x80 in UTF2000.
(MAKE_CHAR): Don't use XCHARSET_PRIVATE_P in UTF2000.