updated for version 7.2-040

diff --git a/src/fileio.c b/src/fileio.c
index 3d473916b24c1e4d4e92a27a4d067a418e867a6d..a28bcd9e65750a714e63351d246fd57578af5819 100644 (file)
--- 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 64671460588043c504b9ba4140aac42c057fafa6..4686098e44ade87f7a337d4a29cf8a127e7545fa 100644 (file)
--- 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,
 /**/