mirror of
https://github.com/vim/vim.git
synced 2025-10-10 06:24:10 -04:00
updated for version 7.2-040
This commit is contained in:
@@ -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]"));
|
||||
|
@@ -676,6 +676,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
40,
|
||||
/**/
|
||||
39,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user