summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2012-03-07 22:55:20 +0100
committerBram Moolenaar <bram@vim.org>2012-03-07 22:55:20 +0100
commit3fad8e902b3d3878b9aa6ca0dbf787eb503a2da1 (patch)
tree69ba370eed22256feb48d42271fa4cb81afd8d06
parent8e7dedf8941f2005a56b745e1af4e3eb429c1c83 (diff)
downloadvim-3fad8e902b3d3878b9aa6ca0dbf787eb503a2da1.tar.gz
updated for version 7.3.470v7.3.470v7-3-470
Problem: Test 62 fails when compiled without GUI and X11. Solution: Don't test :drop when it is not supported.
-rw-r--r--src/testdir/test62.in8
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/testdir/test62.in b/src/testdir/test62.in
index c549c8b4..1e514cd2 100644
--- a/src/testdir/test62.in
+++ b/src/testdir/test62.in
@@ -49,7 +49,7 @@ STARTTEST
:tabclose
:call append(line('$'), test_status)
:"
-:"
+:if has('gui') || has('clientserver')
:" Test for ":tab drop exist-file" to keep current window.
:sp test1
:tab drop test1
@@ -85,6 +85,12 @@ STARTTEST
:tabclose
:q
:call append(line('$'), test_status)
+:else
+:" :drop not supported
+:call append(line('$'), 'tab drop 1: pass')
+:call append(line('$'), 'tab drop 2: pass')
+:call append(line('$'), 'tab drop 3: pass')
+:endif
:"
:"
:/^Results/,$w! test.out
diff --git a/src/version.c b/src/version.c
index 2932be8c..6b773ffd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 470,
+/**/
469,
/**/
468,