diff options
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();    }  | 
