diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-04-13 20:37:35 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-04-13 20:37:35 +0000 |
| commit | 7fc904b610d5739dd7b72fb2f6b0e4b330c97179 (patch) | |
| tree | a7ea75d0ab26a753f13949e25e08e2c875b37d69 /src/diff.c | |
| parent | 18144c84231aee36ae1d11b74941c9b318f1706a (diff) | |
updated for version 7.0d03v7.0d03
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/diff.c b/src/diff.c index bc0364c77c..4896c049ac 100644 --- a/src/diff.c +++ b/src/diff.c @@ -839,7 +839,13 @@ diff_file(tmp_orig, tmp_new, tmp_diff) (diff_flags & DIFF_ICASE) ? "-i " : "", tmp_orig, tmp_new); append_redir(cmd, p_srr, tmp_diff); +#ifdef FEAT_AUTOCMD + ++autocmd_block; /* Avoid ShellCmdPost stuff */ +#endif (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT); +#ifdef FEAT_AUTOCMD + --autocmd_block; +#endif vim_free(cmd); } } @@ -942,7 +948,13 @@ ex_diffpatch(eap) fullname != NULL ? fullname : # endif eap->arg); +#ifdef FEAT_AUTOCMD + ++autocmd_block; /* Avoid ShellCmdPost stuff */ +#endif (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED); +#ifdef FEAT_AUTOCMD + --autocmd_block; +#endif } #ifdef UNIX |