diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-12-13 01:42:34 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-12-13 01:42:34 -0500 |
| commit | cd1be8350dd8fcc317cf1c618770b2bbdd4b94d5 (patch) | |
| tree | c7f7ae2b21cc698b77805579aaff05a159dd8908 /src | |
| parent | 3c9d8ac99e0df7701855f5b534b4202aa0a21bb2 (diff) | |
| parent | 0488fea0dea7f092f6c4bbaa744118f0d6275263 (diff) | |
| download | rneovim-cd1be8350dd8fcc317cf1c618770b2bbdd4b94d5.tar.gz rneovim-cd1be8350dd8fcc317cf1c618770b2bbdd4b94d5.tar.bz2 rneovim-cd1be8350dd8fcc317cf1c618770b2bbdd4b94d5.zip | |
Merge pull request #3834 from Shougo/vim-7.4.635
vim-patch:7.4.635
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/fileio.c | 11 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 87fcddd3e9..1a6c85abaa 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -1544,6 +1544,11 @@ rewind_retry: /* 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; + } + if (*p == NL) { if (!try_unix || (try_dos && p > ptr && p[-1] == CAR)) @@ -1551,6 +1556,8 @@ rewind_retry: else fileformat = EOL_UNIX; break; + } else if (*p == CAR && try_mac) { + try_mac++; } } @@ -1571,6 +1578,10 @@ rewind_retry: if (try_mac > try_unix) fileformat = EOL_MAC; } + } else if (fileformat == EOL_UNKNOWN && try_mac == 1) { + // Looking for CR but found no end-of-line markers at all: + // use the default format. + fileformat = default_fileformat(); } } diff --git a/src/nvim/version.c b/src/nvim/version.c index 75c21d4b37..2f51b16398 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -361,7 +361,7 @@ static int included_patches[] = { // 638 NA 637, 636, - // 635, + 635, // 634, 633, // 632 NA |