diff options
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 9 | 
1 files changed, 7 insertions, 2 deletions
| diff --git a/src/diff.c b/src/diff.c index af40b1295a..67d941c35a 100644 --- a/src/diff.c +++ b/src/diff.c @@ -25,6 +25,7 @@  #include "undo.h"  #include "window.h"  #include "os/os.h" +#include "os/shell.h"  static int diff_busy = FALSE;    // ex_diffgetput() is busy @@ -840,7 +841,11 @@ static void diff_file(char_u *tmp_orig, char_u *tmp_new, char_u *tmp_diff)                     tmp_orig, tmp_new);        append_redir(cmd, (int)len, p_srr, tmp_diff);        block_autocmds(); /* Avoid ShellCmdPost stuff */ -      (void)call_shell(cmd, SHELL_FILTER | SHELL_SILENT | SHELL_DOOUT, NULL); +      (void)call_shell( +          cmd, +          kShellOptFilter | kShellOptSilent | kShellOptDoOut, +          NULL +          );        unblock_autocmds();        vim_free(cmd);      } @@ -943,7 +948,7 @@ void ex_diffpatch(exarg_T *eap)  #endif  // ifdef UNIX      // Avoid ShellCmdPost stuff      block_autocmds(); -    (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED, NULL); +    (void)call_shell(buf, kShellOptFilter | kShellOptCooked, NULL);      unblock_autocmds();    } | 
