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

patch 7.4.1122

Browse Source 
Problem:    Test 92 and 93 fail when using gvim on a system with a non utf-8
            locale.
Solution:   Avoid using .gvimrc by adding -U NONE. (Yukihiro Nakadaira)
This commit is contained in:
Bram Moolenaar 2016-01-17 18:49:57 +01:00
parent 08b270a8a4
commit 42c9cfa7f4
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/testdir/Make_dos.mak
View File

@ -38,7 +38,7 @@ win32: nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests report
$(DOSTMP_INFILES): $(*B).in $(DOSTMP_INFILES): $(*B).in
if not exist $(DOSTMP)\NUL md $(DOSTMP) if not exist $(DOSTMP)\NUL md $(DOSTMP)
if exist $@ del $@ if exist $@ del $@
$(VIMPROG) -u dos.vim --noplugin "+set ff=dos|f $@|wq" $(*B).in $(VIMPROG) -u dos.vim -U NONE --noplugin "+set ff=dos|f $@|wq" $(*B).in
# For each input file dostmp/test99.in run the tests. # For each input file dostmp/test99.in run the tests.
# This moves test99.in to test99.in.bak temporarily. # This moves test99.in to test99.in.bak temporarily.
@ -55,7 +55,7 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
-@if exist Xfind rd /s /q Xfind -@if exist Xfind rd /s /q Xfind
-@del X* -@del X*
-@if exist viminfo del viminfo -@if exist viminfo del viminfo
$(VIMPROG) -u dos.vim --noplugin "+set ff=unix|f test.out|wq" \ $(VIMPROG) -u dos.vim -U NONE --noplugin "+set ff=unix|f test.out|wq" \
$(DOSTMP)\$(*B).out $(DOSTMP)\$(*B).out
@diff test.out $*.ok & if errorlevel 1 \ @diff test.out $*.ok & if errorlevel 1 \
( move /y test.out $*.failed \ ( move /y test.out $*.failed \
@ -114,4 +114,4 @@ bench_re_freeze.out: bench_re_freeze.vim
newtests: $(NEW_TESTS) newtests: $(NEW_TESTS)
.vim.res: .vim.res:
$(VIMPROG) -u NONE -S runtest.vim $*.vim $(VIMPROG) -u NONE -U NONE -S runtest.vim $*.vim

4
src/testdir/Make_ming.mak
View File

@ -65,8 +65,8 @@ win32: fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32)
echo ALL DONE echo ALL DONE
fixff: fixff:
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok -$(VIMPROG) -u dos.vim -U NONE --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \ -$(VIMPROG) -u dos.vim -U NONE --noplugin "+argdo set ff=unix|upd" +q \
dotest.in test60.ok test71.ok test74.ok test_listchars.ok dotest.in test60.ok test71.ok test74.ok test_listchars.ok
clean: clean:

2
src/testdir/Make_vms.mms
View File

@ -163,7 +163,7 @@ SCRIPT_PYTHON = test86.out test87.out
-@ write sys$output " "$*" " -@ write sys$output " "$*" "
-@ write sys$output "-----------------------------------------------" -@ write sys$output "-----------------------------------------------"
-@ !run the test -@ !run the test
-@ create/term/wait/nodetach mcr $(VIMPROG) $(GUI_OPTION) -u vms.vim --noplugin -s dotest.in $*.in -@ create/term/wait/nodetach mcr $(VIMPROG) $(GUI_OPTION) -u vms.vim -U NONE --noplugin -s dotest.in $*.in
-@ !analyse the result -@ !analyse the result
-@ directory /size/date test.out -@ directory /size/date test.out
-@ if "''F$SEARCH("test.out.*")'" .NES. "" then rename/nolog test.out $*.out -@ if "''F$SEARCH("test.out.*")'" .NES. "" then rename/nolog test.out $*.out

2
src/testdir/Makefile
View File

@ -127,4 +127,4 @@ newtestssilent: $(NEW_TESTS)
.vim.res: .vim.res:
$(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim $(RUN_VIMTEST) -u NONE -U NONE -S runtest.vim $*.vim

2
src/version.c
View File

@ -741,6 +741,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 */
/**/
1122,
/**/ /**/
1121, 1121,
/**/ /**/