diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-11-12 15:05:21 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-11-12 15:05:21 +0000 |
| commit | 1c8603613a33f6012c7d7e0d9db02323f2e785b4 (patch) | |
| tree | 95ea34870e173c4ea2da0f18e2a0a9b7d49b90a1 | |
| parent | 0f71c6d02066becafcaa0c2eba52dc0be166f821 (diff) | |
| download | vim-git-1c8603613a33f6012c7d7e0d9db02323f2e785b4.tar.gz | |
updated for version 7.2-040v7.2.040
| -rw-r--r-- | src/fileio.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/fileio.c b/src/fileio.c index 3d473916b..a28bcd9e6 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -932,7 +932,10 @@ retry: else { if (eap != NULL && eap->force_ff != 0) + { fileformat = get_fileformat_force(curbuf, eap); + try_unix = try_dos = try_mac = FALSE; + } else if (curbuf->b_p_bin) fileformat = EOL_UNIX; /* binary: use Unix format */ else if (*p_ffs == NUL) @@ -2341,11 +2344,6 @@ failed: STRCAT(IObuff, _("[CR missing]")); c = TRUE; } - if (ff_error == EOL_MAC) - { - STRCAT(IObuff, _("[NL found]")); - c = TRUE; - } if (split) { STRCAT(IObuff, _("[long lines split]")); diff --git a/src/version.c b/src/version.c index 646714605..4686098e4 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 40, +/**/ 39, /**/ 38, |