Mercurial > vim
diff src/fileio.c @ 1742:0e4fa55d20e0 v7.2.040
updated for version 7.2-040
author | vimboss |
---|---|
date | Wed, 12 Nov 2008 15:05:21 +0000 |
parents | 35abb7026415 |
children | f10fe14748e2 |
line wrap: on
line diff
--- 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]"));