0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.0054

This commit is contained in:
Bram Moolenaar
2005-02-28 22:44:58 +00:00
parent 4d01d630a5
commit 8cd06cabf3
10 changed files with 141 additions and 18 deletions

View File

@@ -1333,10 +1333,19 @@ retry:
* If there is conversion error or not enough room try using
* another conversion.
*/
if ((iconv(iconv_fd, (void *)&fromp, &from_size, &top, &to_size)
while ((iconv(iconv_fd, (void *)&fromp, &from_size,
&top, &to_size)
== (size_t)-1 && ICONV_ERRNO != ICONV_EINVAL)
|| from_size > CONV_RESTLEN)
goto rewind_retry;
{
if (!keep_dest_enc)
goto rewind_retry;
/* Ignore a byte and try again. */
++fromp;
--from_size;
*top++ = '?';
--to_size;
}
if (from_size > 0)
{