Mercurial > vim
diff src/mbyte.c @ 1752:a8aae2e1d2ae v7.2.049
updated for version 7.2-049
| author | vimboss |
|---|---|
| date | Thu, 20 Nov 2008 16:10:17 +0000 |
| parents | 4ca6669af2cd |
| children | f10fe14748e2 |
line wrap: on
line diff
--- a/src/mbyte.c +++ b/src/mbyte.c @@ -6101,7 +6101,7 @@ string_convert_ext(vcp, ptr, lenp, uncon /* 1. codepage/UTF-8 -> ucs-2. */ if (vcp->vc_cpfrom == 0) - tmp_len = utf8_to_ucs2(ptr, len, NULL, NULL); + tmp_len = utf8_to_utf16(ptr, len, NULL, NULL); else tmp_len = MultiByteToWideChar(vcp->vc_cpfrom, 0, ptr, len, 0, 0); @@ -6109,13 +6109,13 @@ string_convert_ext(vcp, ptr, lenp, uncon if (tmp == NULL) break; if (vcp->vc_cpfrom == 0) - utf8_to_ucs2(ptr, len, tmp, unconvlenp); + utf8_to_utf16(ptr, len, tmp, unconvlenp); else MultiByteToWideChar(vcp->vc_cpfrom, 0, ptr, len, tmp, tmp_len); /* 2. ucs-2 -> codepage/UTF-8. */ if (vcp->vc_cpto == 0) - retlen = ucs2_to_utf8(tmp, tmp_len, NULL); + retlen = utf16_to_utf8(tmp, tmp_len, NULL); else retlen = WideCharToMultiByte(vcp->vc_cpto, 0, tmp, tmp_len, 0, 0, 0, 0); @@ -6123,7 +6123,7 @@ string_convert_ext(vcp, ptr, lenp, uncon if (retval != NULL) { if (vcp->vc_cpto == 0) - ucs2_to_utf8(tmp, tmp_len, retval); + utf16_to_utf8(tmp, tmp_len, retval); else WideCharToMultiByte(vcp->vc_cpto, 0, tmp, tmp_len, retval, retlen, 0, 0);