diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-04-24 16:34:02 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-04-24 16:34:02 +0200 |
| commit | e8d9530b0efd8e0efb9e832cd3d70245c61751ab (patch) | |
| tree | 870274e3fdb404cb7d7c6555588dfe4a597fdb39 | |
| parent | 2ab0713279c26f23718a2913e92e22957833fe35 (diff) | |
| download | vim-git-e8d9530b0efd8e0efb9e832cd3d70245c61751ab.tar.gz | |
updated for version 7.3.915v7.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)
| -rw-r--r-- | src/fileio.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/fileio.c b/src/fileio.c index 251d15544..46fdea9b4 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 adab0a83b..fef8b9bef 100644 --- 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, |