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)

diff --git a/src/fileio.c b/src/fileio.c
index 251d1554475a72e48980137739d17808e7fb214d..46fdea9b45e1e404e475f1a65a299b63904696b4 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1380,6 +1380,8 @@ retry:
 # endif
                           )
                        {
+                           if (can_retry)
+                               goto rewind_retry;
                            if (conv_error == 0)
                                conv_error = curbuf->b_ml.ml_line_count
                                                                - linecnt + 1;

diff --git a/src/version.c b/src/version.c
index adab0a83ba967cd2267017df5894f7b638183dbc..fef8b9bef9400280af04ce2728d161a686c6919d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    915,
 /**/
     914,
 /**/