mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-01 01:41:01 -08:00
Code Issues Projects Releases Wiki Activity

(string_to_non_ascii_char): Return correct length for

Browse source 
a charset of dimension 2 and composition character.
This commit is contained in:
Kenichi Handa 1998-11-09 07:06:11 +00:00
parent 5f1af2d872
commit 1dca54f61e
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/charset.c
View file

@ -208,8 +208,10 @@ string_to_non_ascii_char (str, len, actual_len, exclude_tail_garbage)
if (cmpchar_id >= 0)
{
c = MAKE_COMPOSITE_CHAR (cmpchar_id);
str += cmpchar_table[cmpchar_id]->len;
str += cmpchar_table[cmpchar_id]->len - 1;
}
else
str += bytes - 1;
}
else
{
@ -230,7 +232,7 @@ string_to_non_ascii_char (str, len, actual_len, exclude_tail_garbage)
if (CHARSET_DEFINED_P (charset)
&& CHARSET_DIMENSION (charset) == 2
&& str < endp)
c2 = *str & 0x7F;
c2 = *str++ & 0x7F;
c = MAKE_NON_ASCII_CHAR (charset, c1, c2);
}
} while (0);