diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-02-11 19:08:05 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-02-11 19:08:05 +0100 |
| commit | 3b678047bcd50d6f409175dcffe7839dbb74728b (patch) | |
| tree | 1d78ed3a733f4e3fb5d5c6088a54ede4b41cc393 | |
| parent | 5affc034680a95eabfbfca763bedf86ae0a79c44 (diff) | |
| download | vim-git-3b678047bcd50d6f409175dcffe7839dbb74728b.tar.gz | |
patch 8.2.2499: "vim -g --version" does not redirect outputv8.2.2499
Problem: "vim -g --version" does not redirect output.
Solution: Reset gui.starting when showing version info. (closes #7815)
| -rw-r--r-- | src/main.c | 1 | ||||
| -rw-r--r-- | src/testdir/test_version.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 17 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c index ef53b3373..82e89a8cb 100644 --- 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; diff --git a/src/testdir/test_version.vim b/src/testdir/test_version.vim index a578f97de..958c126a4 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 @@ 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 diff --git a/src/version.c b/src/version.c index 8b287a0c6..2f4a03eee 100644 --- 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, |