diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-10-18 03:08:32 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-10-18 03:08:32 +0000 |
| commit | 4c0354d71bb71c17af97ec956379603ccbb42a18 (patch) | |
| tree | 8f3ebc4af4b125f170ea6c3461b945878cf3b07d /src/insdel.c | |
| parent | e5f035d75ea1e81103dc58b50e3e8afa44fbc34e (diff) | |
| download | emacs-4c0354d71bb71c17af97ec956379603ccbb42a18.tar.gz | |
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.
Diffstat (limited to 'src/insdel.c')
| -rw-r--r-- | src/insdel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/insdel.c b/src/insdel.c index eaf899c8a0e..b09bed66d55 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -666,9 +666,9 @@ copy_text (const unsigned char *from_addr, unsigned char *to_addr, { int c = *from_addr++; - if (c >= 0200) + if (!ASCII_CHAR_P (c)) { - c = unibyte_char_to_multibyte (c); + c = BYTE8_TO_CHAR (c); to_addr += CHAR_STRING (c, to_addr); nbytes--; } @@ -694,11 +694,11 @@ count_size_as_multibyte (const unsigned char *ptr, EMACS_INT nbytes) { unsigned int c = *ptr++; - if (c < 0200) + if (ASCII_CHAR_P (c)) outgoing_nbytes++; else { - c = unibyte_char_to_multibyte (c); + c = BYTE8_TO_CHAR (c); outgoing_nbytes += CHAR_BYTES (c); } } |