aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/normal.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-04-28 23:58:31 +0800
committerGitHub <noreply@github.com>2023-04-28 23:58:31 +0800
commit4720f4379ac79c6b8f88e3dce9f3c910b0f3aee2 (patch)
tree041691af3c586bfc94eceff12b066035a3705cfb /src/nvim/normal.c
parent233b858f2a2f3b57d07675e2de45736da36709e8 (diff)
parentdfb2808d1a318bc7c328330a2c6e77201165204f (diff)
downloadrneovim-4720f4379ac79c6b8f88e3dce9f3c910b0f3aee2.tar.gz
rneovim-4720f4379ac79c6b8f88e3dce9f3c910b0f3aee2.tar.bz2
rneovim-4720f4379ac79c6b8f88e3dce9f3c910b0f3aee2.zip
Merge pull request #23377 from zeertzjq/vim-9.0.1336
vim-patch:9.0.{1336,1372}
Diffstat (limited to 'src/nvim/normal.c')
-rw-r--r--src/nvim/normal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index da693371f3..5a5286905f 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -956,7 +956,7 @@ normal_end:
set_reg_var(get_default_register_name());
}
- s->c = finish_op;
+ const bool prev_finish_op = finish_op;
if (s->oa.op_type == OP_NOP) {
// Reset finish_op, in case it was set
finish_op = false;
@@ -964,7 +964,7 @@ normal_end:
}
// Redraw the cursor with another shape, if we were in Operator-pending
// mode or did a replace command.
- if (s->c || s->ca.cmdchar == 'r'
+ if (prev_finish_op || s->ca.cmdchar == 'r'
|| (s->ca.cmdchar == 'g' && s->ca.nchar == 'r')) {
ui_cursor_shape(); // may show different cursor shape
}