diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-01-11 14:52:11 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-01-11 21:05:02 -0500 |
| commit | dcd77c64ef7865f47b9a6e86da033da8aaa3100c (patch) | |
| tree | bbe41c876f4fb0ba48650f9e4bbf011dd130167c /src | |
| parent | 207ba359b0127fa5893b980abcb9186ffec1879c (diff) | |
| download | rneovim-dcd77c64ef7865f47b9a6e86da033da8aaa3100c.tar.gz rneovim-dcd77c64ef7865f47b9a6e86da033da8aaa3100c.tar.bz2 rneovim-dcd77c64ef7865f47b9a6e86da033da8aaa3100c.zip | |
inccommand: Suppress error reporting when previewing commands
Closes #5912
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_cmds.c | 2 | ||||
| -rw-r--r-- | src/nvim/ex_getln.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index b1a17e8c44..b1404abc05 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -6093,7 +6093,6 @@ void ex_substitute(exarg_T *eap) int save_w_p_cul = curwin->w_p_cul; int save_w_p_cuc = curwin->w_p_cuc; - emsg_off++; // No error messages during command preview. curbuf->b_p_ul = LONG_MAX; // make sure we can undo all changes curwin->w_p_cul = false; // Disable 'cursorline' curwin->w_p_cuc = false; // Disable 'cursorcolumn' @@ -6120,6 +6119,5 @@ void ex_substitute(exarg_T *eap) restore_search_patterns(); win_size_restore(&save_view); ga_clear(&save_view); - emsg_off--; unblock_autocmds(); } diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 7c725179dd..dba7a73814 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -1607,7 +1607,9 @@ static int command_line_changed(CommandLineState *s) // - Update the screen while the effects are in place. // - Immediately undo the effects. State |= CMDPREVIEW; + emsg_silent++; // Block error reporting as the command may be incomplete do_cmdline(ccline.cmdbuff, NULL, NULL, DOCMD_KEEPLINE|DOCMD_NOWAIT); + emsg_silent--; // Unblock error reporting // Restore the window "view". curwin->w_cursor = s->old_cursor; |