aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.2499: "vim -g --version" does not redirect output

Browse Source 
Problem:    "vim -g --version" does not redirect output.
Solution:   Reset gui.starting when showing version info. (closes #7815)
This commit is contained in:
Bram Moolenaar 2021-02-11 19:08:05 +01:00
parent 5affc03468
commit 3b678047bc
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main.c
View File

@ -1979,6 +1979,7 @@ command_line_scan(mparm_T *parmp)
{ {
Columns = 80; // need to init Columns Columns = 80; // need to init Columns
info_message = TRUE; // use mch_msg(), not mch_errmsg() info_message = TRUE; // use mch_msg(), not mch_errmsg()
gui.starting = FALSE; // not starting GUI, will exit
list_version(); list_version();
msg_putchar('\n'); msg_putchar('\n');
msg_didout = FALSE; msg_didout = FALSE;

14
src/testdir/test_version.vim
View File

@ -1,5 +1,8 @@
" Test :version Ex command " Test :version Ex command
so check.vim
so shared.vim
func Test_version() func Test_version()
" version should always return the same string. " version should always return the same string.
let v1 = execute('version') let v1 = execute('version')
@ -9,4 +12,15 @@ func Test_version()
call assert_match("^\n\nVIM - Vi IMproved .*", v1) call assert_match("^\n\nVIM - Vi IMproved .*", v1)
endfunc 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 " vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2499,
/**/ /**/
2498, 2498,
/**/ /**/