mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-19 17:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3834 from Shougo/vim-7.4.635

Browse Source 
vim-patch:7.4.635
This commit is contained in:
Justin M. Keyes
2015-12-13 01:42:34 -05:00
parent 3c9d8ac99e 0488fea0de
commit cd1be8350d
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/fileio.c
View File

@@ -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();
}
}