aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.1978: making a mapping work in all modes is complicated

Browse Source 
Problem:    Making a mapping work in all modes is complicated.
Solution:   Add the <Cmd> special key. (Yegappan Lakshmanan, closes #7282,
            closes 4784, based on patch by Bjorn Linse)
This commit is contained in:
Bram Moolenaar
2020-11-12 14:21:06 +01:00
parent ea2d407f9c
commit 957cf67d50
19 changed files with 646 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/normal.c
View File

@@ -375,6 +375,7 @@ static const struct nv_cmd
#endif
{K_CURSORHOLD, nv_cursorhold, NV_KEEPREG, 0},
{K_PS, nv_edit, 0, 0},
{K_COMMAND, nv_colon, 0, 0},
};
// Number of commands in nv_cmds[].
@@ -3312,10 +3313,11 @@ nv_exmode(cmdarg_T *cap)
static void
nv_colon(cmdarg_T *cap)
{
int old_p_im;
int cmd_result;
int old_p_im;
int cmd_result;
int is_cmdkey = cap->cmdchar == K_COMMAND;
if (VIsual_active)
if (VIsual_active && !is_cmdkey)
nv_operator(cap);
else
{
@@ -3325,7 +3327,7 @@ nv_colon(cmdarg_T *cap)
cap->oap->motion_type = MCHAR;
cap->oap->inclusive = FALSE;
}
else if (cap->count0)
else if (cap->count0 && !is_cmdkey)
{
// translate "count:" into ":.,.+(count - 1)"
stuffcharReadbuff('.');
@@ -3343,7 +3345,7 @@ nv_colon(cmdarg_T *cap)
old_p_im = p_im;
// get a command line and execute it
cmd_result = do_cmdline(NULL, getexline, NULL,
cmd_result = do_cmdline(NULL, is_cmdkey ? getcmdkeycmd : getexline, NULL,
cap->oap->op_type != OP_NOP ? DOCMD_KEEPLINE : 0);
// If 'insertmode' changed, enter or exit Insert mode