commit 42c9cfa7f4d2f176234e385573ff2fb1f61915e5
author Bram Moolenaar <Bram@vim.org> Sun Jan 17 18:49:57 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Sun Jan 17 18:49:57 2016 +0100
tree a5376a7fe453db6a983cbb80fb432ae86fc71e8b
parent 08b270a8a4544be9a7fecce311834fde2b457634

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)

src/testdir/Make_dos.mak

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 4809930..3073e9e 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -38,7 +38,7 @@
 $(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 @@
 	-@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 @@
 newtests: $(NEW_TESTS)
 
 .vim.res:
-	$(VIMPROG) -u NONE -S runtest.vim $*.vim
+	$(VIMPROG) -u NONE -U NONE -S runtest.vim $*.vim

src/testdir/Make_ming.mak

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index b4ebaeb..d0b088c 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -65,8 +65,8 @@
 	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:

src/testdir/Make_vms.mms

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 9a93e21..17b7429 100644
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -163,7 +163,7 @@
 	-@ 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 

src/testdir/Makefile

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

src/version.c

diff --git a/src/version.c b/src/version.c
index 06044d4..76e176a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1122,
+/**/
     1121,
 /**/
     1120,