From 1c8603613a33f6012c7d7e0d9db02323f2e785b4 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 12 Nov 2008 15:05:21 +0000 Subject: [PATCH] updated for version 7.2-040 --- src/fileio.c | 8 +++----- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/fileio.c b/src/fileio.c index 3d473916b2..a28bcd9e65 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 6467146058..4686098e44 100644 --- a/src/version.c +++ b/src/version.c @@ -676,6 +676,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 40, /**/ 39, /**/ -- 2.47.3