patch 8.1.1298: invalid argument test fails without X clipboard

Problem:    Invalid argument test fails without X clipboard.
Solution:   Test -display only with the +xterm_clipboard feature.

diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 61c508275ca7f579398a32f07aa057b1aa507526..8f494a8507e267ec5a5a11ee0cbaa8a1d2f06958 100644 (file)
--- 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 da0d1dfabb284718176ac8a8542945f790325bec..90f9e87bf9ae24e1c6e162c82c24f08dd773f51d 100644 (file)
--- 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,
 /**/