diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-02-04 21:50:19 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-02-04 21:50:19 +0100 |
| commit | 1fb0d49803b4f57025ed6a43b1f5b9eb91524645 (patch) | |
| tree | f8d5002a3bd243df10663b78b18bc7ba4ccf4cc2 | |
| parent | a1891848d970452cd775d35a4bccfdd9758a690a (diff) | |
| download | vim-git-1fb0d49803b4f57025ed6a43b1f5b9eb91524645.tar.gz | |
patch 8.0.0304: assign test fails in the GUIv8.0.0304
Problem: Assign test fails in the GUI.
Solution: Skip the test for setting t_k1.
| -rw-r--r-- | src/testdir/test_assign.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/testdir/test_assign.vim b/src/testdir/test_assign.vim index 22aa4a1d3..4a4c644cf 100644 --- 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 037c2dde2..9273b2baa 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 */ /**/ + 304, +/**/ 303, /**/ 302, |