changeset 23913:dfdd973cf0c9 v8.2.2499

patch 8.2.2499: "vim -g --version" does not redirect output Commit: https://github.com/vim/vim/commit/3b678047bcd50d6f409175dcffe7839dbb74728b Author: Bram Moolenaar <Bram@vim.org> Date: Thu Feb 11 19:08:05 2021 +0100 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 https://github.com/vim/vim/issues/7815)
author Bram Moolenaar <Bram@vim.org>
date Thu, 11 Feb 2021 19:15:03 +0100
parents 3b393768db03
children b56544307168
files src/main.c src/testdir/test_version.vim src/version.c
diffstat 3 files changed, 17 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.c
+++ b/src/main.c
@@ -1979,6 +1979,7 @@ command_line_scan(mparm_T *parmp)
 		{
 		    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;
--- 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 @@ func Test_version()
   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
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2499,
+/**/
     2498,
 /**/
     2497,