changeset 10829:8233f8f3f7ae v8.0.0304

patch 8.0.0304: assign test fails in the GUI commit https://github.com/vim/vim/commit/1fb0d49803b4f57025ed6a43b1f5b9eb91524645 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Feb 4 21:50:19 2017 +0100 patch 8.0.0304: assign test fails in the GUI Problem: Assign test fails in the GUI. Solution: Skip the test for setting t_k1.
author Christian Brabandt <cb@256bit.org>
date Sat, 04 Feb 2017 22:00:04 +0100
parents fc9fa0b5480a
children fe0e00dab982
files src/testdir/test_assign.vim src/version.c
diffstat 2 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_assign.vim
+++ b/src/testdir/test_assign.vim
@@ -15,11 +15,13 @@ func Test_let_termcap()
   call assert_match('t_te.*^[[yes;', execute("set termcap"))
   let &t_te = old_t_te
 
-  " Key code
-  let old_t_k1 = &t_k1
-  let &t_k1 = "that"
-  call assert_match('t_k1.*that', execute("set termcap"))
-  let &t_k1 = old_t_k1
+  if !has('gui_running')
+    " Key code
+    let old_t_k1 = &t_k1
+    let &t_k1 = "that"
+    call assert_match('t_k1.*that', execute("set termcap"))
+    let &t_k1 = old_t_k1
+  endif
 
   call assert_fails('let x = &t_xx', 'E15')
   let &t_xx = "yes"
--- 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 */
 /**/
+    304,
+/**/
     303,
 /**/
     302,