diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-09-29 12:16:41 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-09-29 12:16:41 +0000 |
| commit | 78ab331e0d8a76f553830f0347ac27311e4dc0f8 (patch) | |
| tree | df1c313bb5c0cae5db59d08f852971a0c10fd89c /src/diff.c | |
| parent | 51b8436f09c0ea855758b2086d92f838acab7631 (diff) | |
| download | vim-git-78ab331e0d8a76f553830f0347ac27311e4dc0f8.tar.gz | |
updated for version 7.1-125v7.1.125
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/diff.c b/src/diff.c index b6f335415..23142cf03 100644 --- a/src/diff.c +++ b/src/diff.c @@ -840,11 +840,11 @@ diff_file(tmp_orig, tmp_new, tmp_diff) tmp_orig, tmp_new); append_redir(cmd, p_srr, tmp_diff); #ifdef FEAT_AUTOCMD - ++autocmd_block; /* Avoid ShellCmdPost stuff */ + block_autocmds(); /* Avoid ShellCmdPost stuff */ #endif (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT); #ifdef FEAT_AUTOCMD - --autocmd_block; + unblock_autocmds(); #endif vim_free(cmd); } @@ -949,11 +949,11 @@ ex_diffpatch(eap) # endif eap->arg); #ifdef FEAT_AUTOCMD - ++autocmd_block; /* Avoid ShellCmdPost stuff */ + block_autocmds(); /* Avoid ShellCmdPost stuff */ #endif (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED); #ifdef FEAT_AUTOCMD - --autocmd_block; + unblock_autocmds(); #endif } |