diff src/fns.c @ 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/fns.c	Sun Oct 18 02:17:57 2009 +0000
+++ b/src/fns.c	Sun Oct 18 03:08:32 2009 +0000
@@ -297,7 +297,7 @@
       else
 	{
 	  c1 = SREF (str1, i1++);
-	  c1 = unibyte_char_to_multibyte (c1);
+	  MAKE_CHAR_MULTIBYTE (c1);
 	}
 
       if (STRING_MULTIBYTE (str2))
@@ -305,7 +305,7 @@
       else
 	{
 	  c2 = SREF (str2, i2++);
-	  c2 = unibyte_char_to_multibyte (c2);
+	  MAKE_CHAR_MULTIBYTE (c2);
 	}
 
       if (c1 == c2)
@@ -703,10 +703,10 @@
 		  {
 		    XSETFASTINT (elt, SREF (this, thisindex)); thisindex++;
 		    if (some_multibyte
-			&& XINT (elt) >= 0200
+			&& !ASCII_CHAR_P (XINT (elt))
 			&& XINT (elt) < 0400)
 		      {
-			c = unibyte_char_to_multibyte (XINT (elt));
+			c = BYTE8_TO_CHAR (XINT (elt));
 			XSETINT (elt, c);
 		      }
 		  }