Mercurial > emacs
changeset 29101:4341105dc3f0
(skip_chars): Use FETCH_STRING_CHAR_ADVANCE unconditionally.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Tue, 23 May 2000 02:25:45 +0000 |
| parents | a941c97dc65b |
| children | ba9cfbfc601e |
| files | src/syntax.c |
| diffstat | 1 files changed, 6 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/src/syntax.c Tue May 23 02:25:11 2000 +0000 +++ b/src/syntax.c Tue May 23 02:25:45 2000 +0000 @@ -1361,15 +1361,9 @@ while (i_byte < size_byte) { - int c_leading_code; + int c_leading_code = XSTRING (string)->data[i_byte]; - if (string_multibyte) - { - c_leading_code = XSTRING (string)->data[i_byte]; - FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte); - } - else - c = c_leading_code = XSTRING (string)->data[i_byte++]; + FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte); /* Convert multibyteness between what the string has and what the buffer has. */ @@ -1387,13 +1381,8 @@ if (i_byte == size_byte) break; - if (string_multibyte) - { - c_leading_code = XSTRING (string)->data[i_byte]; - FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte); - } - else - c = c_leading_code = XSTRING (string)->data[i_byte++]; + c_leading_code = XSTRING (string)->data[i_byte]; + FETCH_STRING_CHAR_ADVANCE (c, string, i, i_byte); } if (i_byte < size_byte && XSTRING (string)->data[i_byte] == '-') @@ -1407,13 +1396,8 @@ break; /* Get the end of the range. */ - if (string_multibyte) - { - c2_leading_code = XSTRING (string)->data[i_byte]; - FETCH_STRING_CHAR_ADVANCE (c2, string, i, i_byte); - } - else - c2 = XSTRING (string)->data[i_byte++]; + c2_leading_code = XSTRING (string)->data[i_byte]; + FETCH_STRING_CHAR_ADVANCE (c2, string, i, i_byte); if (SINGLE_BYTE_CHAR_P (c)) {