summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_startup.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 61c508275..8f494a850 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -430,7 +430,7 @@ func Test_invalid_args()
call assert_equal('More info with: "vim -h"', out[2])
endif
- if has('clipboard')
+ if has('xterm_clipboard')
let out = split(system(GetVimCommand() .. ' -display'), "\n")
call assert_equal(1, v:shell_error)
call assert_match('^VIM - Vi IMproved .* (.*)$', out[0])
diff --git a/src/version.c b/src/version.c
index da0d1dfab..90f9e87bf 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 */
/**/
+ 1298,
+/**/
1297,
/**/
1296,