0
0
mirror of https://github.com/vim/vim.git synced 2025-10-05 05:34:07 -04:00

updated for version 7.3.915

Problem:    When reading a file with encoding conversion fails at the end the
            next encoding in 'fencs' is not used.
Solution:   Retry with another encoding when possible. (Taro Muraoka)
This commit is contained in:
Bram Moolenaar
2013-04-24 16:34:02 +02:00
parent 2ab0713279
commit e8d9530b0e
2 changed files with 4 additions and 0 deletions

View File

@@ -1380,6 +1380,8 @@ retry:
# endif # endif
) )
{ {
if (can_retry)
goto rewind_retry;
if (conv_error == 0) if (conv_error == 0)
conv_error = curbuf->b_ml.ml_line_count conv_error = curbuf->b_ml.ml_line_count
- linecnt + 1; - linecnt + 1;

View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
915,
/**/ /**/
914, 914,
/**/ /**/