diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-11-23 01:45:44 -0500 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-11-23 07:45:24 -0500 |
| commit | dd3583836b80e8eccd483d41125aa24f63d2f038 (patch) | |
| tree | 8cdd2359d5a66be9cd73acfc0eaf0c54c5dff052 | |
| parent | 1aae46422242677c6cc23438537b70444436e5ce (diff) | |
| download | rneovim-dd3583836b80e8eccd483d41125aa24f63d2f038.tar.gz rneovim-dd3583836b80e8eccd483d41125aa24f63d2f038.tar.bz2 rneovim-dd3583836b80e8eccd483d41125aa24f63d2f038.zip | |
vim-patch:8.1.2361: MS-Windows: test failures related to VIMDLL
Problem: MS-Windows: test failures related to VIMDLL.
Solution: Adjust code and tests. (Ken Takata, closes vim/vim#5283)
https://github.com/vim/vim/commit/310c32e8920140f0db747c6c6eb06b1ee53cdb5a
| -rw-r--r-- | src/nvim/ex_cmds.c | 7 | ||||
| -rw-r--r-- | src/nvim/testdir/test_highlight.vim | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index b8a0c3184b..d2ccbe3e6d 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -1182,6 +1182,7 @@ static void do_filter( char_u *cmd_buf; buf_T *old_curbuf = curbuf; int shell_flags = 0; + const int stmp = p_stmp; if (*cmd == NUL) /* no filter command */ return; @@ -1210,16 +1211,16 @@ static void do_filter( if (do_out) shell_flags |= kShellOptDoOut; - if (!do_in && do_out && !p_stmp) { + if (!do_in && do_out && !stmp) { // Use a pipe to fetch stdout of the command, do not use a temp file. shell_flags |= kShellOptRead; curwin->w_cursor.lnum = line2; - } else if (do_in && !do_out && !p_stmp) { + } else if (do_in && !do_out && !stmp) { // Use a pipe to write stdin of the command, do not use a temp file. shell_flags |= kShellOptWrite; curbuf->b_op_start.lnum = line1; curbuf->b_op_end.lnum = line2; - } else if (do_in && do_out && !p_stmp) { + } else if (do_in && do_out && !stmp) { // Use a pipe to write stdin and fetch stdout of the command, do not // use a temp file. shell_flags |= kShellOptRead | kShellOptWrite; diff --git a/src/nvim/testdir/test_highlight.vim b/src/nvim/testdir/test_highlight.vim index 00e42733a7..a80a73161f 100644 --- a/src/nvim/testdir/test_highlight.vim +++ b/src/nvim/testdir/test_highlight.vim @@ -516,7 +516,7 @@ func Test_termguicolors() if !exists('+termguicolors') return endif - if has('vtp') && !has('vcon') + if has('vtp') && !has('vcon') && !has('gui_running') " Win32: 'guicolors' doesn't work without virtual console. call assert_fails('set termguicolors', 'E954:') return |