diff options
author | Bram Moolenaar <Bram@vim.org> | 2015-02-27 17:48:09 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2015-02-27 17:48:09 +0100 |
commit | c6b7217ff502b8fc28d6c861d25c1943e30973ad (patch) | |
tree | e5b015c5a6e5074bfeb79b5dad7990757c6f74b2 /src/fileio.c | |
parent | d45c07ac7499358c5cb096cadb675ce74ae3eaf6 (diff) | |
download | vim-git-c6b7217ff502b8fc28d6c861d25c1943e30973ad.tar.gz |
updated for version 7.4.643v7.4.643
Problem: Using the default file format for Mac files. (Issue 77)
Solution: Reset the try_mac counter in the right place. (Oswald)
Diffstat (limited to 'src/fileio.c')
-rw-r--r-- | src/fileio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fileio.c b/src/fileio.c index 1d16ee8dd..388446a48 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2099,12 +2099,12 @@ rewind_retry: /* First try finding a NL, for Dos and Unix */ if (try_dos || try_unix) { + /* Reset the carriage return counter. */ + if (try_mac) + try_mac = 1; + for (p = ptr; p < ptr + size; ++p) { - /* Reset the carriage return counter. */ - if (try_mac) - try_mac = 1; - if (*p == NL) { if (!try_unix |