0
0
mirror of https://github.com/vim/vim.git synced 2025-07-24 10:45:12 -04:00

updated for version 7.3.1302

Problem:    Test 17 fails on MS-Windows.  Includes line break in file name
            everywhere.
Solution:   Fix 'fileformat'. Omit CR-LF from a line read from an included
            file.
This commit is contained in:
Bram Moolenaar 2013-07-03 22:28:36 +02:00
parent ee0ee2a046
commit c84e3c1ee1
4 changed files with 15 additions and 3 deletions

View File

@ -5352,7 +5352,15 @@ exit_matched:
depth_displayed = depth; depth_displayed = depth;
} }
if (depth >= 0) /* we could read the line */ if (depth >= 0) /* we could read the line */
{
files[depth].lnum++; files[depth].lnum++;
/* Remove any CR and LF from the line. */
i = (int)STRLEN(line);
if (i > 0 && line[i - 1] == '\n')
line[--i] = NUL;
if (i > 0 && line[i - 1] == '\r')
line[--i] = NUL;
}
else if (!already) else if (!already)
{ {
if (++lnum > end_lnum) if (++lnum > end_lnum)

View File

@ -33,6 +33,7 @@ STARTTEST
:" > nmake -f Make_dos.mak test17.out :" > nmake -f Make_dos.mak test17.out
:w! test.out :w! test.out
gf gf
:set ff=unix
:w! test.out :w! test.out
:brewind :brewind
ENDTEST ENDTEST
@ -130,9 +131,10 @@ i%inc FALSE.c foo.c
:checkpath! :checkpath!
:redir END :redir END
:brewind :brewind
:" replace "\" to "/" for Windows :" change "\" to "/" for Windows and fix 'fileformat'
:e test.out :e test.out
:%s#\\#/#g :%s#\\#/#g
:set ff&
:w :w
:q :q
ENDTEST ENDTEST

View File

@ -30,4 +30,4 @@ Xdir1/dir2/foo.c -->
Xdir1/dir2/bar.c --> Xdir1/dir2/bar.c -->
Xdir1/dir2/baz.c Xdir1/dir2/baz.c
Xdir1/dir2/baz.c --> Xdir1/dir2/baz.c -->
foo.c^@ (Already listed) foo.c (Already listed)

View File

@ -728,6 +728,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 */
/**/
1302,
/**/ /**/
1301, 1301,
/**/ /**/