Mercurial > emacs
comparison src/search.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 | 791bb3c2ca7d |
| children | 68dd71358159 |
comparison
equal
deleted
inserted
replaced
| 105660:c79f335459cf | 105661:bac26aa40069 |
|---|---|
| 2757 else | 2757 else |
| 2758 { | 2758 { |
| 2759 /* Note that we don't have to increment POS. */ | 2759 /* Note that we don't have to increment POS. */ |
| 2760 c = SREF (newtext, pos_byte++); | 2760 c = SREF (newtext, pos_byte++); |
| 2761 if (buf_multibyte) | 2761 if (buf_multibyte) |
| 2762 c = unibyte_char_to_multibyte (c); | 2762 MAKE_CHAR_MULTIBYTE (c); |
| 2763 } | 2763 } |
| 2764 | 2764 |
| 2765 /* Either set ADD_STUFF and ADD_LEN to the text to put in SUBSTED, | 2765 /* Either set ADD_STUFF and ADD_LEN to the text to put in SUBSTED, |
| 2766 or set IDX to a match index, which means put that part | 2766 or set IDX to a match index, which means put that part |
| 2767 of the buffer text into SUBSTED. */ | 2767 of the buffer text into SUBSTED. */ |
| 2779 } | 2779 } |
| 2780 else | 2780 else |
| 2781 { | 2781 { |
| 2782 c = SREF (newtext, pos_byte++); | 2782 c = SREF (newtext, pos_byte++); |
| 2783 if (buf_multibyte) | 2783 if (buf_multibyte) |
| 2784 c = unibyte_char_to_multibyte (c); | 2784 MAKE_CHAR_MULTIBYTE (c); |
| 2785 } | 2785 } |
| 2786 | 2786 |
| 2787 if (c == '&') | 2787 if (c == '&') |
| 2788 idx = sub; | 2788 idx = sub; |
| 2789 else if (c >= '1' && c <= '9' && c <= search_regs.num_regs + '0') | 2789 else if (c >= '1' && c <= '9' && c <= search_regs.num_regs + '0') |