thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.1-125

Browse Source
This commit is contained in:
Bram Moolenaar
2007-09-29 12:16:41 +00:00
parent 51b8436f09
commit 78ab331e0d
9 changed files with 62 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/diff.c
View File

@@ -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
}