summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-03-23 13:30:22 +0100
committerBram Moolenaar <Bram@vim.org>2019-03-23 13:30:22 +0100
commit832615be12bdb5d60b2850e2025592dc67217f37 (patch)
treea2664ba4e8352a4bf8ad6f9b2ae1b93710bf87d7 /src
parent295e3ba31f76818f195c654df506c88cb65f9289 (diff)
patch 8.1.1042: the paste test doesn't work properly in the Windows consolev8.1.1042
Problem: The paste test doesn't work properly in the Windows console. Solution: Disable the test.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_paste.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_paste.vim b/src/testdir/test_paste.vim
index 65f300cef0..f3664f6a62 100644
--- a/src/testdir/test_paste.vim
+++ b/src/testdir/test_paste.vim
@@ -1,7 +1,7 @@
" Tests for bracketed paste and other forms of pasting.
-" Bracketed paste only works with "xterm". Not in GUI.
-if has('gui_running')
+" Bracketed paste only works with "xterm". Not in GUI or Windows console.
+if has('gui_running') || has('win32')
finish
endif
set term=xterm
diff --git a/src/version.c b/src/version.c
index ce32f2b589..4dc0df6df1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -776,6 +776,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1042,
+/**/
1041,
/**/
1040,