patch 8.2.2499: "vim -g --version" does not redirect output
Problem: "vim -g --version" does not redirect output.
Solution: Reset gui.starting when showing version info. (closes #7815)
diff --git a/src/main.c b/src/main.c
index ef53b33..82e89a8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1979,6 +1979,7 @@
{
Columns = 80; // need to init Columns
info_message = TRUE; // use mch_msg(), not mch_errmsg()
+ gui.starting = FALSE; // not starting GUI, will exit
list_version();
msg_putchar('\n');
msg_didout = FALSE;
diff --git a/src/testdir/test_version.vim b/src/testdir/test_version.vim
index a578f97..958c126 100644
--- a/src/testdir/test_version.vim
+++ b/src/testdir/test_version.vim
@@ -1,5 +1,8 @@
" Test :version Ex command
+so check.vim
+so shared.vim
+
func Test_version()
" version should always return the same string.
let v1 = execute('version')
@@ -9,4 +12,15 @@
call assert_match("^\n\nVIM - Vi IMproved .*", v1)
endfunc
+func Test_version_redirect()
+ CheckNotGui
+ CheckCanRunGui
+ CheckUnix
+
+ call RunVim([], [], '--clean -g --version >Xversion 2>&1')
+ call assert_match('Features included', readfile('Xversion')->join())
+
+ call delete('Xversion')
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 8b287a0..2f4a03e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2499,
+/**/
2498,
/**/
2497,