diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-09-28 12:46:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 12:46:03 +0200 |
| commit | 87fa495b21c8afa77c190b30e67c78f237c77216 (patch) | |
| tree | 3b426c3d6ede9c7ea4099c1c798fdac05e662d38 /src/nvim/diff.c | |
| parent | 22dfe6925d4784cf60d8d9a054abc5066e4b867f (diff) | |
| parent | 7e6a8310b73579b2fa78fb6c410c7101a9f70254 (diff) | |
| download | rneovim-87fa495b21c8afa77c190b30e67c78f237c77216.tar.gz rneovim-87fa495b21c8afa77c190b30e67c78f237c77216.tar.bz2 rneovim-87fa495b21c8afa77c190b30e67c78f237c77216.zip | |
Merge #5395 from justinmk/log
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index ef5acf4845..f7b96ba3e1 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -906,8 +906,7 @@ void ex_diffpatch(exarg_T *eap) eval_patch((char *) tmp_orig, (char *) eap->arg, (char *) tmp_new); #endif // ifdef UNIX } else { - // Build the patch command and execute it. Ignore errors. Switch to - // cooked mode to allow the user to respond to prompts. + // Build the patch command and execute it. Ignore errors. #ifdef UNIX vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"", tmp_new, tmp_orig, fullname != NULL ? fullname : eap->arg); @@ -915,8 +914,7 @@ void ex_diffpatch(exarg_T *eap) vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"", tmp_new, tmp_orig, eap->arg); #endif // ifdef UNIX - // Avoid ShellCmdPost stuff - block_autocmds(); + block_autocmds(); // Avoid ShellCmdPost stuff (void)call_shell(buf, kShellOptFilter, NULL); unblock_autocmds(); } |