summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-04 19:26:56 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-04 19:26:56 +0200
commit510671a055c2d7a329c88bf133ac302139fd3221 (patch)
tree8e81a7968b1afec97e0592b23e30c7cdc2d12cd1
parent4b8366b56edbf4f3efcaeedbaba491c49c5788ca (diff)
patch 8.1.1268: map completion test fails in GUIv8.1.1268
Problem: Map completion test fails in GUI. Solution: Skip the test that fails.
-rw-r--r--src/testdir/test_cmdline.vim6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 91a4b4e845..3b275b617d 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -111,8 +111,10 @@ func Test_map_completion()
call feedkeys(":map \<Esc>[17~x f6x\<CR>", 'xt')
call feedkeys(":map <L\<Tab>\<Home>\"\<CR>", 'xt')
call assert_equal('"map <Left>', getreg(':'))
- call feedkeys(":map \<Esc>[17~\<Tab>\<Home>\"\<CR>", 'xt')
- call assert_equal("\"map <F6>x", getreg(':'))
+ if !has('gui_running')
+ call feedkeys(":map \<Esc>[17~\<Tab>\<Home>\"\<CR>", 'xt')
+ call assert_equal("\"map <F6>x", getreg(':'))
+ endif
unmap <Left>
call feedkeys(":unmap \<Esc>[17~x\<CR>", 'xt')
set cpo-=<
diff --git a/src/version.c b/src/version.c
index 6877673604..98c557363e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1268,
+/**/
1267,
/**/
1266,