mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 05:58:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.2361: MS-Windows: test failures related to VIMDLL

Browse Source 
Problem:    MS-Windows: test failures related to VIMDLL.
Solution:   Adjust code and tests. (Ken Takata, closes vim/vim#5283)
310c32e892
This commit is contained in:
Jan Edmund Lazo
2020-11-23 01:45:44 -05:00
parent 1aae464222
commit dd3583836b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/ex_cmds.c
View File

@@ -1182,6 +1182,7 @@ static void do_filter(
char_u *cmd_buf; char_u *cmd_buf;
buf_T *old_curbuf = curbuf; buf_T *old_curbuf = curbuf;
int shell_flags = 0; int shell_flags = 0;
const int stmp = p_stmp;
if (*cmd == NUL) /* no filter command */ if (*cmd == NUL) /* no filter command */
return; return;
@@ -1210,16 +1211,16 @@ static void do_filter(
if (do_out) if (do_out)
shell_flags |= kShellOptDoOut; 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. // Use a pipe to fetch stdout of the command, do not use a temp file.
shell_flags |= kShellOptRead; shell_flags |= kShellOptRead;
curwin->w_cursor.lnum = line2; 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. // Use a pipe to write stdin of the command, do not use a temp file.
shell_flags |= kShellOptWrite; shell_flags |= kShellOptWrite;
curbuf->b_op_start.lnum = line1; curbuf->b_op_start.lnum = line1;
curbuf->b_op_end.lnum = line2; 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 pipe to write stdin and fetch stdout of the command, do not
// use a temp file. // use a temp file.
shell_flags |= kShellOptRead | kShellOptWrite; shell_flags |= kShellOptRead | kShellOptWrite;

2
src/nvim/testdir/test_highlight.vim
View File

@@ -516,7 +516,7 @@ func Test_termguicolors()
if !exists('+termguicolors') if !exists('+termguicolors')
return return
endif endif
if has('vtp') && !has('vcon') if has('vtp') && !has('vcon') && !has('gui_running')
" Win32: 'guicolors' doesn't work without virtual console. " Win32: 'guicolors' doesn't work without virtual console.
call assert_fails('set termguicolors', 'E954:') call assert_fails('set termguicolors', 'E954:')
return return