diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-02-02 22:18:42 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-02-02 22:18:42 -0500 |
| commit | 8e92b7f9fce0a7eb5da0aab616dd8509ae4a0eb7 (patch) | |
| tree | 36b7a4e74f177280b5a2bd0aa4aeb3a91c5922ef /src/nvim/fileio.c | |
| parent | a4ea4dac4568f9ad12956e30d32e2e16da0099cb (diff) | |
| parent | f104ce2d15862c2207f6960e611a65562d49e3f0 (diff) | |
| download | rneovim-8e92b7f9fce0a7eb5da0aab616dd8509ae4a0eb7.tar.gz rneovim-8e92b7f9fce0a7eb5da0aab616dd8509ae4a0eb7.tar.bz2 rneovim-8e92b7f9fce0a7eb5da0aab616dd8509ae4a0eb7.zip | |
Merge pull request #4153 from watiko/vim-7.4.643
vim-patch:7.4.643
Diffstat (limited to 'src/nvim/fileio.c')
| -rw-r--r-- | src/nvim/fileio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index badb5b85b0..90987d0b3d 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -1543,12 +1543,12 @@ rewind_retry: if (fileformat == EOL_UNKNOWN) { /* First try finding a NL, for Dos and Unix */ if (try_dos || try_unix) { - for (p = ptr; p < ptr + size; ++p) { - // Reset the carriage return counter. - if (try_mac) { - try_mac = 1; - } + // Reset the carriage return counter. + if (try_mac) { + try_mac = 1; + } + for (p = ptr; p < ptr + size; ++p) { if (*p == NL) { if (!try_unix || (try_dos && p > ptr && p[-1] == CAR)) |