Mercurial > vim

changeset 16590:5c212dd3cd64 v8.1.1298

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1298: invalid argument test fails without X clipboard commit https://github.com/vim/vim/commit/5416b75031138182387399f8fe5e17a884414e1a Author: Bram Moolenaar <Bram@vim.org> Date: Wed May 8 18:36:43 2019 +0200 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.
author Bram Moolenaar <Bram@vim.org>
date Wed, 08 May 2019 18:45:05 +0200
parents 21a60d40c5ad
children 13e6287dfae3
files src/testdir/test_startup.vim src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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])
--- 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,