comparison 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.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 18 Oct 2009 03:08:32 +0000
parents 522f4ac8f10a
children 68dd71358159
comparison
equal deleted inserted replaced
105660:c79f335459cf 105661:bac26aa40069
295 if (STRING_MULTIBYTE (str1)) 295 if (STRING_MULTIBYTE (str1))
296 FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c1, str1, i1, i1_byte); 296 FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c1, str1, i1, i1_byte);
297 else 297 else
298 { 298 {
299 c1 = SREF (str1, i1++); 299 c1 = SREF (str1, i1++);
300 c1 = unibyte_char_to_multibyte (c1); 300 MAKE_CHAR_MULTIBYTE (c1);
301 } 301 }
302 302
303 if (STRING_MULTIBYTE (str2)) 303 if (STRING_MULTIBYTE (str2))
304 FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c2, str2, i2, i2_byte); 304 FETCH_STRING_CHAR_ADVANCE_NO_CHECK (c2, str2, i2, i2_byte);
305 else 305 else
306 { 306 {
307 c2 = SREF (str2, i2++); 307 c2 = SREF (str2, i2++);
308 c2 = unibyte_char_to_multibyte (c2); 308 MAKE_CHAR_MULTIBYTE (c2);
309 } 309 }
310 310
311 if (c1 == c2) 311 if (c1 == c2)
312 continue; 312 continue;
313 313
701 } 701 }
702 else 702 else
703 { 703 {
704 XSETFASTINT (elt, SREF (this, thisindex)); thisindex++; 704 XSETFASTINT (elt, SREF (this, thisindex)); thisindex++;
705 if (some_multibyte 705 if (some_multibyte
706 && XINT (elt) >= 0200 706 && !ASCII_CHAR_P (XINT (elt))
707 && XINT (elt) < 0400) 707 && XINT (elt) < 0400)
708 { 708 {
709 c = unibyte_char_to_multibyte (XINT (elt)); 709 c = BYTE8_TO_CHAR (XINT (elt));
710 XSETINT (elt, c); 710 XSETINT (elt, c);
711 } 711 }
712 } 712 }
713 } 713 }
714 else if (BOOL_VECTOR_P (this)) 714 else if (BOOL_VECTOR_P (this))