Mercurial > vim

changeset 4331:d8053e6bf72a v7.3.915

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Wed, 24 Apr 2013 16:34:02 +0200
parents 17913b23e7bc
children 84991fa5e74f
files src/fileio.c src/version.c
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    915,
+/**/
     914,
 /**/
     913,