diff src/character.h @ 105661:bac26aa40069

Remove leftover table unibyte_to_multibyte_table. * character.c (unibyte_to_multibyte_table): Remove. (Funibyte_char_to_multibyte): Use MAKE_CHAR_MULTIBYTE. * charset.c (init_charset_once): Don't init unibyte_to_multibyte_table. * character.h (UNIBYTE_TO_CHAR): New macro. (MAKE_CHAR_MULTIBYTE): Use it. (unibyte_to_multibyte_table, unibyte_char_to_multibyte): Remove. * xdisp.c (get_next_display_element): USE ASCII_CHAR_P. (message_dolog, set_message_1): * search.c (Freplace_match): * editfns.c (Fcompare_buffer_substrings): * fns.c (Fcompare_strings): Use MAKE_CHAR_MULTIBYTE. (concat): * insdel.c (copy_text, count_size_as_multibyte): Use ASCII_CHAR_P and BYTE8_TO_CHAR. * term.c (produce_glyphs): * syntax.c (skip_chars): Use BYTE8_TO_CHAR. * regex.c (RE_CHAR_TO_MULTIBYTE): * cmds.c (internal_self_insert): * buffer.h (FETCH_CHAR_AS_MULTIBYTE): Use UNIBYTE_TO_CHAR.

--- a/src/character.h	Sun Oct 18 02:17:57 2009 +0000
+++ b/src/character.h	Sun Oct 18 03:08:32 2009 +0000
@@ -62,6 +62,9 @@
 /* Return the character code for raw 8-bit byte BYTE.  */
 #define BYTE8_TO_CHAR(byte) ((byte) + 0x3FFF00)
 
+#define UNIBYTE_TO_CHAR(byte) \
+  (ASCII_BYTE_P (byte) ? (byte) : BYTE8_TO_CHAR (byte))
+
 /* Return the raw 8-bit byte for character C.  */
 #define CHAR_TO_BYTE8(c)	\
   (CHAR_BYTE8_P (c)		\
@@ -79,14 +82,6 @@
    that corresponds to a raw 8-bit byte.  */
 #define CHAR_BYTE8_HEAD_P(byte) ((byte) == 0xC0 || (byte) == 0xC1)
 
-/* Mapping table from unibyte chars to multibyte chars.  */
-extern int unibyte_to_multibyte_table[256];
-
-/* Convert the unibyte character C to the corresponding multibyte
-   character.  If C can't be converted, return C.  */
-#define unibyte_char_to_multibyte(c)	\
-  ((c) < 256 ? unibyte_to_multibyte_table[(c)] : (c))
-
 /* If C is not ASCII, make it unibyte. */
 #define MAKE_CHAR_UNIBYTE(c)	\
   do {				\
@@ -97,7 +92,7 @@
 
 /* If C is not ASCII, make it multibyte.  Assumes C < 256.  */
 #define MAKE_CHAR_MULTIBYTE(c) \
-  (eassert ((c) >= 0 && (c) < 256), (c) = unibyte_to_multibyte_table[(c)])
+  (eassert ((c) >= 0 && (c) < 256), (c) = UNIBYTE_TO_CHAR (c))
 
 /* This is the maximum byte length of multibyte form.  */
 #define MAX_MULTIBYTE_LENGTH 5