diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index 61c508275c..8f494a8507 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 da0d1dfabb..90f9e87bf9 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1298, /**/ 1297, /**/