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.

diff --git a/src/testdir/test_assign.vim b/src/testdir/test_assign.vim
index 22aa4a1d319de3d2ae6da1eb19dab89caa01958b..4a4c644cff65f90b3b7d12f7fcf1b590d4246fd1 100644 (file)
--- 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"

diff --git a/src/version.c b/src/version.c
index 037c2dde252e675d51dcd76a8de609a63916f214..9273b2baa4dc3c9ffd005ea8b2e8d350dbee3a08 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    304,
 /**/
     303,
 /**/