From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 8 May 2019 15:58:15 +0000 (+0200)
Subject: patch 8.1.1297: invalid argument test fails without GTK
X-Git-Tag: v8.1.1297
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=240f7abab01b5e3fd5336dd780e42501ec3f2fcb;p=vim

patch 8.1.1297: invalid argument test fails without GTK

Problem:    Invalid argument test fails without GTK.
Solution:   Test -display and --display separately.
---

diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index a45130f7a..61c508275 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -422,7 +422,7 @@ func Test_invalid_args()
     endfor
   endif
 
-  if has('clipboard')
+  if has('gui_gtk')
     let out = split(system(GetVimCommand() .. ' --display'), "\n")
     call assert_equal(1, v:shell_error)
     call assert_match('^VIM - Vi IMproved .* (.*)$',         out[0])
@@ -430,6 +430,14 @@ func Test_invalid_args()
     call assert_equal('More info with: "vim -h"',            out[2])
   endif
 
+  if has('clipboard')
+    let out = split(system(GetVimCommand() .. ' -display'), "\n")
+    call assert_equal(1, v:shell_error)
+    call assert_match('^VIM - Vi IMproved .* (.*)$',         out[0])
+    call assert_equal('Argument missing after: "-display"', out[1])
+    call assert_equal('More info with: "vim -h"',            out[2])
+  endif
+
   let out = split(system(GetVimCommand() .. ' -ix'), "\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 8e6b404f8..da0d1dfab 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 */
+/**/
+    1297,
 /**/
     1296,
 /**/