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:
@@ -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;
|
||||||
|
@@ -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,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user