summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-01-24 19:18:13 +0100
committerBram Moolenaar <Bram@vim.org>2017-01-24 19:18:13 +0100
commitbff6ad133195145f810645c0bde7a2a1fdfc37b8 (patch)
treeb78269e7514041241f6a4feb6b7988405ddb3c94
parent48c9f3b123364f368472564a66a9b71dc383558b (diff)
patch 8.0.0233: paste test fails in the GUIv8.0.0233
Problem: The paste test fails if the GUI is being used. Solution: Skip the test in the GUI.
-rw-r--r--src/testdir/test_paste.vim5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/testdir/test_paste.vim b/src/testdir/test_paste.vim
index ffd2dfa32f..dfe6bdc875 100644
--- a/src/testdir/test_paste.vim
+++ b/src/testdir/test_paste.vim
@@ -1,6 +1,9 @@
" Tests for bracketed paste.
-" Bracketed paste only works with "xterm".
+" Bracketed paste only works with "xterm". Not in GUI.
+if has('gui_running')
+ finish
+endif
set term=xterm
func Test_paste_normal_mode()
diff --git a/src/version.c b/src/version.c
index c7ef2bec56..1b78243549 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 233,
+/**/
232,
/**/
231,