summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-10-06 19:10:35 +0200
committerBram Moolenaar <Bram@vim.org>2012-10-06 19:10:35 +0200
commitb35c338f96dab732fa112d7719f10191c7bb34f0 (patch)
tree600ff246ddbdae57c77601638e386db50ba32314
parent0c5fa7d740bafefbf0b2ea48a2a660901d7d4f10 (diff)
updated for version 7.3.684v7.3.684
Problem: "make test" does not delete lua.vim. Solution: Add lua.vim to the clean target. (Simon Ruderich)
-rw-r--r--src/testdir/Make_dos.mak1
-rw-r--r--src/testdir/Make_ming.mak1
-rw-r--r--src/testdir/Make_vms.mms3
-rw-r--r--src/testdir/Makefile6
-rw-r--r--src/version.c2
5 files changed, 9 insertions, 4 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 487ecd80af..b52f249f00 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -62,6 +62,7 @@ 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
-del X*
-if exist viminfo del viminfo
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 4128f9f6fa..c150424684 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -85,6 +85,7 @@ clean:
-$(DEL) tiny.vim
-$(DEL) mbyte.vim
-$(DEL) mzscheme.vim
+ -$(DEL) lua.vim
-$(DEL) X*
-$(DEL) viminfo
diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index dfc4a7b84b..6608d70677 100644
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -4,7 +4,7 @@
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
#
-# Last change: 2012 Apr 05
+# Last change: 2012 Oct 06
#
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
# Edit the lines in the Configuration section below to select.
@@ -184,5 +184,6 @@ 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 20d9781b24..c3923e0ccc 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -48,10 +48,10 @@ report:
$(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
clean:
- -rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* valgrind.* viminfo
+ -rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok X* valgrind.* viminfo
test1.out: test1.in
- -rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* viminfo
+ -rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok X* viminfo
$(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in
@/bin/sh -c "if diff test.out $*.ok; \
then mv -f test.out $*.out; \
@@ -73,7 +73,7 @@ test1.out: test1.in
fi \
else echo $* NO OUTPUT >>test.log; \
fi"
-# -rm -rf X* test.ok viminfo
+ -rm -rf X* test.ok viminfo
test49.out: test49.vim
diff --git a/src/version.c b/src/version.c
index 62e0f4b1a8..63a5136dc0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 684,
+/**/
683,
/**/
682,