Mercurial > vim
comparison src/fileio.c @ 4331:d8053e6bf72a v7.3.915
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 | dc3efb6d5a08 |
| children | 04736b4030ec |
comparison
equal
deleted
inserted
replaced
| 4330:17913b23e7bc | 4331:d8053e6bf72a |
|---|---|
| 1378 # ifdef USE_ICONV | 1378 # ifdef USE_ICONV |
| 1379 || iconv_fd != (iconv_t)-1 | 1379 || iconv_fd != (iconv_t)-1 |
| 1380 # endif | 1380 # endif |
| 1381 ) | 1381 ) |
| 1382 { | 1382 { |
| 1383 if (can_retry) | |
| 1384 goto rewind_retry; | |
| 1383 if (conv_error == 0) | 1385 if (conv_error == 0) |
| 1384 conv_error = curbuf->b_ml.ml_line_count | 1386 conv_error = curbuf->b_ml.ml_line_count |
| 1385 - linecnt + 1; | 1387 - linecnt + 1; |
| 1386 } | 1388 } |
| 1387 /* Remember the first linenr with an illegal byte */ | 1389 /* Remember the first linenr with an illegal byte */ |