aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/normal.c
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2020-11-18 19:45:40 +0100
committerGitHub <noreply@github.com>2020-11-18 19:45:40 +0100
commit569e5c86bfd7e7729229030fc2045c624e5f33c4 (patch)
treeade072bafae35d14e7c1223bbdeebcec5057c46d /src/nvim/normal.c
parent790fd58714a98e7910a4a0a56f85fb568f35d52c (diff)
parent147917369ed8d372feaa9181acd249277636da26 (diff)
downloadrneovim-569e5c86bfd7e7729229030fc2045c624e5f33c4.tar.gz
rneovim-569e5c86bfd7e7729229030fc2045c624e5f33c4.tar.bz2
rneovim-569e5c86bfd7e7729229030fc2045c624e5f33c4.zip
Merge pull request #13316 from bfredl/vim-8.2.2005
vim-patch:8.2.2005: redoing a mapping with <Cmd> doesn't work properly
Diffstat (limited to 'src/nvim/normal.c')
-rw-r--r--src/nvim/normal.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 2805a7d74e..4b26ae259e 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -1485,7 +1485,8 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
if ((redo_yank || oap->op_type != OP_YANK)
&& ((!VIsual_active || oap->motion_force)
// Also redo Operator-pending Visual mode mappings.
- || (cap->cmdchar == ':' && oap->op_type != OP_COLON))
+ || ((cap->cmdchar == ':' || cap->cmdchar == K_COMMAND)
+ && oap->op_type != OP_COLON))
&& cap->cmdchar != 'D'
&& oap->op_type != OP_FOLD
&& oap->op_type != OP_FOLDOPEN
@@ -1678,7 +1679,7 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
prep_redo(oap->regname, cap->count0,
get_op_char(oap->op_type), get_extra_op_char(oap->op_type),
oap->motion_force, cap->cmdchar, cap->nchar);
- } else if (cap->cmdchar != ':') {
+ } else if (cap->cmdchar != ':' && cap->cmdchar != K_COMMAND) {
int nchar = oap->op_type == OP_REPLACE ? cap->nchar : NUL;
// reverse what nv_replace() did