patch 8.1.0185: running tests writes lua.vim even though it is not used

Problem:    Running tests writes lua.vim even though it is not used.
Solution:   Stop writing lua.vim.

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 6cd8de6463df9c29e09e25a6624bfa8b53f6af94..6a86d3efd3659ce995448c6869e1bdf717f680f5 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -85,7 +85,6 @@ clean:
        -if exist tiny.vim del tiny.vim
        -if exist mbyte.vim del mbyte.vim
        -if exist mzscheme.vim del mzscheme.vim
-       -if exist lua.vim del lua.vim
        -if exist Xdir1 rd /s /q Xdir1
        -if exist Xfind rd /s /q Xfind
        -if exist XfakeHOME rd /s /q XfakeHOME

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index d66d6678c8cea1ca3243cbd9ffe428fc7b97bdec..7b38be53eff8a31567ae4ce0438169aa5364333f 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -75,7 +75,6 @@ clean:
        -@if exist tiny.vim $(DEL) tiny.vim
        -@if exist mbyte.vim $(DEL) mbyte.vim
        -@if exist mzscheme.vim $(DEL) mzscheme.vim
-       -@if exist lua.vim $(DEL) lua.vim
        -@if exist Xdir1 $(DELDIR) Xdir1
        -@if exist Xfind $(DELDIR) Xfind
        -@if exist XfakeHOME $(DELDIR) XfakeHOME

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index e97ad27a8e1e63bc55928acb663d03fc9429abf5..f14f6bc3db1fdf7ba22271b8e5b73a790be8aace 100644 (file)
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -208,6 +208,5 @@ clean :
        -@ if "''F$SEARCH("small.vim")'"    .NES. "" then delete/noconfirm/nolog small.vim.*
        -@ if "''F$SEARCH("mbyte.vim")'"    .NES. "" then delete/noconfirm/nolog mbyte.vim.*
        -@ if "''F$SEARCH("mzscheme.vim")'" .NES. "" then delete/noconfirm/nolog mzscheme.vim.*
-       -@ if "''F$SEARCH("lua.vim")'"      .NES. "" then delete/noconfirm/nolog lua.vim.*
        -@ if "''F$SEARCH("viminfo.*")'"    .NES. "" then delete/noconfirm/nolog viminfo.*.*
 

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 459b86878322cc0d8240f466d818801ced11541b..57bcb3aa6aa308c51e55d5f4958de8badb78b717 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -51,7 +51,7 @@ $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS): $(VIMPROG)
 $(SCRIPTS) $(SCRIPTS_GUI) $(NEW_TESTS): $(SCRIPTS_FIRST)
 
 RM_ON_RUN = test.out X* viminfo
-RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok benchmark.out
+RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim test.ok benchmark.out
 RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG) -f $(GUI_FLAG) -u unix.vim $(NO_INITS) -s dotest.in
 
 clean:

diff --git a/src/testdir/test1.in b/src/testdir/test1.in
index 735d53967327856b00ad405be67dfccba52e0eeb..8c0219ea600af3831d569e7f241ad2b507217009 100644 (file)
--- a/src/testdir/test1.in
+++ b/src/testdir/test1.in
@@ -15,7 +15,6 @@ If Vim was not compiled with the +multi_byte feature, the mbyte.vim script will
 be set like small.vim above.  mbyte.vim is sourced by tests that require the
 +multi_byte feature.
 Similar logic is applied to the +mzscheme feature, using mzscheme.vim.
-Similar logic is applied to the +lua feature, using lua.vim.
 
 STARTTEST
 :" If columns or lines are too small, create wrongtermsize.
@@ -33,7 +32,6 @@ w! test.out
 qa!
 \e:w! mbyte.vim
 :w! mzscheme.vim
-:w! lua.vim
 :"
 :" If +multi_byte feature supported, make mbyte.vim empty.
 :if has("multi_byte") | sp another | w! mbyte.vim | q | endif
@@ -41,9 +39,6 @@ qa!
 :" If +mzscheme feature supported, make mzscheme.vim empty.
 :if has("mzscheme") | sp another | w! mzscheme.vim | q | endif
 :"
-:" If +lua feature supported, make lua.vim empty.
-:if has("lua") | sp another | w! lua.vim | q | endif
-:"
 :" If +eval feature supported quit here, leaving tiny.vim and small.vim empty.
 :" Otherwise write small.vim to skip the test.
 :if 1 | q! | endif

diff --git a/src/version.c b/src/version.c
index a1535f6822d209882cef6fb8ac54dfe4b22a01f7..f638db610ae62938951147c38e25b4f0ee20b232 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -789,6 +789,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    185,
 /**/
     184,
 /**/