0
0
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00

updated for version 7.0097

This commit is contained in:
Bram Moolenaar
2005-06-29 22:40:58 +00:00
parent 24bbcfe8fe
commit 42eeac3552
123 changed files with 6496 additions and 3288 deletions

View File

@@ -1344,8 +1344,11 @@ retry:
== (size_t)-1 && ICONV_ERRNO != ICONV_EINVAL)
|| from_size > CONV_RESTLEN)
{
if (!keep_dest_enc)
if (!keep_dest_enc && can_retry)
goto rewind_retry;
if (!keep_dest_enc)
conv_error = TRUE;
/* Ignore a byte and try again. */
++fromp;
--from_size;
@@ -1761,6 +1764,7 @@ rewind_retry:
conv_error = TRUE;
else
# endif
if (illegal_byte == 0) /* Keep the first linenr */
{
char_u *s;