patch 7.4.1122

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)

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 480993087a22a114a048750fb0222f86fcf7831e..3073e9eb5c2b196601bf7f3e09136c377a74bf3b 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -38,7 +38,7 @@ win32:        nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests report
 $(DOSTMP_INFILES): $(*B).in
        if not exist $(DOSTMP)\NUL md $(DOSTMP)
        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.
 # 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
        -@del X*
        -@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
        @diff test.out $*.ok & if errorlevel 1 \
                ( move /y test.out $*.failed \
@@ -114,4 +114,4 @@ bench_re_freeze.out: bench_re_freeze.vim
 newtests: $(NEW_TESTS)
 
 .vim.res:
-       $(VIMPROG) -u NONE -S runtest.vim $*.vim
+       $(VIMPROG) -u NONE -U NONE -S runtest.vim $*.vim

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index b4ebaebe91fc166d3a78aead1021bf736d0c70cc..d0b088c609540ae5ae722a692809f5d377b8b976 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -65,8 +65,8 @@ win32:        fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32)
        echo ALL DONE
 
 fixff:
-       -$(VIMPROG) -u dos.vim --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=dos|upd" +q *.in *.ok
+       -$(VIMPROG) -u dos.vim -U NONE --noplugin "+argdo set ff=unix|upd" +q \
                dotest.in test60.ok test71.ok test74.ok test_listchars.ok
 
 clean:

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 9a93e21a75e088cf34e2b91b4ef539a22b2a453b..17b74299439d5d29b65372cbfa19884af0b66067 100644 (file)
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -163,7 +163,7 @@ SCRIPT_PYTHON = test86.out test87.out
        -@ write sys$output "                "$*" "
        -@ write sys$output "-----------------------------------------------"
        -@ !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
        -@ directory /size/date test.out
        -@ if "''F$SEARCH("test.out.*")'" .NES. "" then rename/nolog test.out $*.out 

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 8f321b58522f38889f8914f55e0f69b764dc8cd8..6d98a80a345fbc522a9ccd5a223787e8856f6098 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -127,4 +127,4 @@ newtestssilent: $(NEW_TESTS)
 
 
 .vim.res:
-       $(RUN_VIMTEST) -u NONE -S runtest.vim $*.vim
+       $(RUN_VIMTEST) -u NONE -U NONE -S runtest.vim $*.vim

diff --git a/src/version.c b/src/version.c
index 06044d4701706ccaae18b44986741e36596776bb..76e176a888fe002dca2e9dc8f75a30d8855efce7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1122,
 /**/
     1121,
 /**/