From e8d9530b0efd8e0efb9e832cd3d70245c61751ab Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 24 Apr 2013 16:34:02 +0200
Subject: [PATCH] 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)

---
 src/fileio.c  | 2 ++
 src/version.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/fileio.c b/src/fileio.c
index 251d155447..46fdea9b45 100644
--- 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 adab0a83ba..fef8b9bef9 100644
--- 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,
 /**/