In Japanese Windows, test92 and test93 fails when using gvim.
vim/src/testdir> nmake -f Make_dos.mak VIMPROG=..\gvim
Test script convert newline from unix to dos with this command.
..\gvim -u dos.vim --noplugin "+set ff=dos|f dostmp\test92.in|wq"
test92.in
Test92 and test93 has modeline setting 'fenc' option.
vim: set ft=vim fenc=utf-8:
If ~/_gvimrc exists, Vim sets 'nocompatible' and 'modeline'. and 'fenc' is
set to utf-8 by modeline. Then ":wq" (cp932 to utf-8 conversion) fails.
Adding "-U NONE" fixes this problem.
--
Yukihiro Nakadaira - [email protected]
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 47f9d22..8055e47 100644
--- 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 \
@@ -113,4 +113,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 b4ebaeb..d0b088c 100644
--- 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 9a93e21..17b7429 100644
--- 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 8f321b5..6d98a80 100644
--- 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