thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.1301

Browse Source 
Problem:    Some tests fail on MS-Windows.
Solution:   Fix path separators in test 89 and 96.  Omit test 97, escaping
            works differently.  Make findfile() work on MS-Windows.
This commit is contained in:
Bram Moolenaar
2013-07-03 21:19:07 +02:00
parent 3437b91102
commit ee0ee2a046
6 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/misc2.c
View File

@@ -4693,14 +4693,14 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
#ifdef FEAT_PATH_EXTRA
else
{
char_u *p = vim_strrchr(search_ctx->ffsc_fix_path, PATHSEP);
char_u *p = gettail(search_ctx->ffsc_fix_path);
char_u *wc_path = NUL;
char_u *temp = NUL;
int len = 0;
if (p != NULL)
if (p > search_ctx->ffsc_fix_path)
{
len = p - search_ctx->ffsc_fix_path;
len = p - search_ctx->ffsc_fix_path - 1;
STRNCAT(ff_expand_buffer, search_ctx->ffsc_fix_path, len);
add_pathsep(ff_expand_buffer);
}

4
src/testdir/Make_dos.mak
View File

@@ -11,7 +11,7 @@ VIMPROG = ..\\vim
# test12 can't unlink a swap file
# test25 uses symbolic link
# test27 can't edit file with "*" in file name
# test31 16 bit version runs out of memory...
# test97 \{ and \$ are not escaped characters.
SCRIPTS16 = test1.out test19.out test20.out test22.out \
test23.out test24.out test28.out test29.out \
@@ -32,7 +32,7 @@ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
test79.out test80.out test81.out test82.out test83.out \
test84.out test85.out test86.out test87.out test88.out \
test89.out test90.out test91.out test92.out test93.out \
test94.out test95.out test96.out test97.out
test94.out test95.out test96.out
SCRIPTS32 = test50.out test70.out

4
src/testdir/Make_ming.mak
View File

@@ -28,7 +28,7 @@ VIMPROG = ..$(DIRSLASH)vim
# test12 can't unlink a swap file
# test25 uses symbolic link
# test27 can't edit file with "*" in file name
# test31 16 bit version runs out of memory...
# test97 \{ and \$ are not escaped characters.
SCRIPTS16 = test1.out test19.out test20.out test22.out \
test23.out test24.out test28.out test29.out \
@@ -52,7 +52,7 @@ SCRIPTS = test3.out test4.out test5.out test6.out test7.out \
test79.out test80.out test81.out test82.out test83.out \
test84.out test85.out test86.out test87.out test88.out \
test89.out test90.out test91.out test92.out test93.out \
test94.out test95.out test96.out test97.out
test94.out test95.out test96.out
SCRIPTS32 = test50.out test70.out

3
src/testdir/Make_os2.mak
View File

@@ -15,6 +15,7 @@ VIMPROG = ../vim.exe
# test52 only for Win32
# test85 no Lua interface
# test86, 87 no Python interface
# test97 \{ and \$ are not escaped characters.
SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
test7.out test8.out test9.out \
@@ -33,7 +34,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
test76.out test77.out test78.out test79.out test80.out \
test81.out test82.out test83.out test84.out test88.out \
test89.out test90.out test91.out test92.out test93.out \
test94.out test95.out test96.out test97.out
test94.out test95.out test96.out
.SUFFIXES: .in .out

3
src/testdir/test96.in
View File

@@ -72,6 +72,8 @@ STARTTEST
:wincmd n
:wincmd K
:b test.out
:let fileName = substitute(fileName, '\\', '/', 'g')
:let locationListFileName = substitute(locationListFileName, '\\', '/', 'g')
:call append(line('$'), "Test A:")
:call append(line('$'), " - file name displayed: " . fileName)
:call append(line('$'), " - quickfix claims that the file name displayed is: " . locationListFileName)
@@ -125,6 +127,7 @@ STARTTEST
:wincmd n
:wincmd K
:b test.out
:let bufferName = substitute(bufferName, '\\', '/', 'g')
:call append(line('$'), "Test C:")
:call append(line('$'), " - 'buftype' of the location list window: " . locationListWindowBufType)
:call append(line('$'), " - buffer displayed in the 2nd window: " . bufferName)

2
src/version.c
View File

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