aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-10 06:24:10 -04:00
Code Activity

updated for version 7.2-040

Browse Source
This commit is contained in:
Bram Moolenaar
2008-11-12 15:05:21 +00:00
parent 0f71c6d020
commit 1c8603613a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/fileio.c
View File

@@ -932,7 +932,10 @@ retry:
else else
{ {
if (eap != NULL && eap->force_ff != 0) if (eap != NULL && eap->force_ff != 0)
{
fileformat = get_fileformat_force(curbuf, eap); fileformat = get_fileformat_force(curbuf, eap);
try_unix = try_dos = try_mac = FALSE;
}
else if (curbuf->b_p_bin) else if (curbuf->b_p_bin)
fileformat = EOL_UNIX; /* binary: use Unix format */ fileformat = EOL_UNIX; /* binary: use Unix format */
else if (*p_ffs == NUL) else if (*p_ffs == NUL)
@@ -2341,11 +2344,6 @@ failed:
STRCAT(IObuff, _("[CR missing]")); STRCAT(IObuff, _("[CR missing]"));
c = TRUE; c = TRUE;
} }
if (ff_error == EOL_MAC)
{
STRCAT(IObuff, _("[NL found]"));
c = TRUE;
}
if (split) if (split)
{ {
STRCAT(IObuff, _("[long lines split]")); STRCAT(IObuff, _("[long lines split]"));

2
src/version.c
View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
40,
/**/ /**/
39, 39,
/**/ /**/