diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-11-20 16:10:17 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-11-20 16:10:17 +0000 |
| commit | 36f692dd8c95aa40a13a0e2ac12542cefdcef030 (patch) | |
| tree | 225595eaf36e52c4f2815d1e4597c177f03c9094 /src/mbyte.c | |
| parent | 8df74be5870f47706d4a84e6499157ca13bf1938 (diff) | |
| download | vim-git-36f692dd8c95aa40a13a0e2ac12542cefdcef030.tar.gz | |
updated for version 7.2-049v7.2.049
Diffstat (limited to 'src/mbyte.c')
| -rw-r--r-- | src/mbyte.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbyte.c b/src/mbyte.c index b7114e8b4..a2ffd7e5f 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -6101,7 +6101,7 @@ string_convert_ext(vcp, ptr, lenp, unconvlenp) /* 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, unconvlenp) 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, unconvlenp) 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); |