aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/normal.c
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2017-09-11 19:14:41 +0800
committerckelsel <ckelsel@hotmail.com>2017-09-11 19:14:41 +0800
commit5ad5bb0c0c1be5fec7e3073dc63d30e19ad26a82 (patch)
tree9f9d762925f8457632ec80cc2082d0f0516a300b /src/nvim/normal.c
parentaf2dd6827299070d81218e9ba54646bfaf53607c (diff)
parentf51a397010dcf4a8308c3b0249810696375b82b2 (diff)
downloadrneovim-5ad5bb0c0c1be5fec7e3073dc63d30e19ad26a82.tar.gz
rneovim-5ad5bb0c0c1be5fec7e3073dc63d30e19ad26a82.tar.bz2
rneovim-5ad5bb0c0c1be5fec7e3073dc63d30e19ad26a82.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/normal.c')
-rw-r--r--src/nvim/normal.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 6415bec846..c40ed58550 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -1942,8 +1942,11 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
* the lines. */
auto_format(false, true);
- if (restart_edit == 0)
+ if (restart_edit == 0) {
restart_edit = restart_edit_save;
+ } else {
+ cap->retval |= CA_COMMAND_BUSY;
+ }
}
break;