Mercurial > vim

comparison src/ex_cmds.c @ 18742:e9b2ade1adbd v8.1.2361

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2361: MS-Windows: test failures related to VIMDLL Commit: https://github.com/vim/vim/commit/310c32e8920140f0db747c6c6eb06b1ee53cdb5a Author: Bram Moolenaar <Bram@vim.org> Date: Fri Nov 29 23:15:25 2019 +0100 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 https://github.com/vim/vim/issues/5283)
author Bram Moolenaar <Bram@vim.org>
date Fri, 29 Nov 2019 23:30:04 +0100
parents 788d76db02ac
children 49b78d6465e5
comparison
equal deleted inserted replaced
18741:3f42c89cf06c 18742:e9b2ade1adbd
1066 buf_T *old_curbuf = curbuf; 1066 buf_T *old_curbuf = curbuf;
1067 int shell_flags = 0; 1067 int shell_flags = 0;
1068 pos_T orig_start = curbuf->b_op_start; 1068 pos_T orig_start = curbuf->b_op_start;
1069 pos_T orig_end = curbuf->b_op_end; 1069 pos_T orig_end = curbuf->b_op_end;
1070 int save_lockmarks = cmdmod.lockmarks; 1070 int save_lockmarks = cmdmod.lockmarks;
1071 #ifdef FEAT_FILTERPIPE
1072 int stmp = p_stmp;
1073 #endif
1071 1074
1072 if (*cmd == NUL) /* no filter command */ 1075 if (*cmd == NUL) /* no filter command */
1073 return; 1076 return;
1074 1077
1075 // Temporarily disable lockmarks since that's needed to propagate changed 1078 // Temporarily disable lockmarks since that's needed to propagate changed
1098 1101
1099 if (do_out) 1102 if (do_out)
1100 shell_flags |= SHELL_DOOUT; 1103 shell_flags |= SHELL_DOOUT;
1101 1104
1102 #ifdef FEAT_FILTERPIPE 1105 #ifdef FEAT_FILTERPIPE
1103 if (!do_in && do_out && !p_stmp) 1106 # ifdef VIMDLL
1107 if (!gui.in_use && !gui.starting)
1108 stmp = 1; // Console mode doesn't support filterpipe.
1109 # endif
1110
1111 if (!do_in && do_out && !stmp)
1104 { 1112 {
1105 /* Use a pipe to fetch stdout of the command, do not use a temp file. */ 1113 /* Use a pipe to fetch stdout of the command, do not use a temp file. */
1106 shell_flags |= SHELL_READ; 1114 shell_flags |= SHELL_READ;
1107 curwin->w_cursor.lnum = line2; 1115 curwin->w_cursor.lnum = line2;
1108 } 1116 }
1109 else if (do_in && !do_out && !p_stmp) 1117 else if (do_in && !do_out && !stmp)
1110 { 1118 {
1111 /* Use a pipe to write stdin of the command, do not use a temp file. */ 1119 /* Use a pipe to write stdin of the command, do not use a temp file. */
1112 shell_flags |= SHELL_WRITE; 1120 shell_flags |= SHELL_WRITE;
1113 curbuf->b_op_start.lnum = line1; 1121 curbuf->b_op_start.lnum = line1;
1114 curbuf->b_op_end.lnum = line2; 1122 curbuf->b_op_end.lnum = line2;
1115 } 1123 }
1116 else if (do_in && do_out && !p_stmp) 1124 else if (do_in && do_out && !stmp)
1117 { 1125 {
1118 /* Use a pipe to write stdin and fetch stdout of the command, do not 1126 /* Use a pipe to write stdin and fetch stdout of the command, do not
1119 * use a temp file. */ 1127 * use a temp file. */
1120 shell_flags |= SHELL_READ|SHELL_WRITE; 1128 shell_flags |= SHELL_READ|SHELL_WRITE;
1121 curbuf->b_op_start.lnum = line1; 1129 curbuf->b_op_start.lnum = line1;