aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.0.0826: cannot use text objects in Terminal mode

Browse Source 
Problem:    Cannot use text objects in Terminal mode.
Solution:   Check for pending operator and Visual mode first. (Yasuhiro
            Matsumoto, closes #1906)
This commit is contained in:
Bram Moolenaar 2017-07-31 22:56:24 +02:00
parent 3633cf5201
commit 662d938666
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/normal.c
View File

@ -9037,14 +9037,6 @@ nv_esc(cmdarg_T *cap)
static void static void
nv_edit(cmdarg_T *cap) nv_edit(cmdarg_T *cap)
{ {
#ifdef FEAT_TERMINAL
if (term_in_terminal_mode())
{
term_leave_terminal_mode();
return;
}
#endif
/* <Insert> is equal to "i" */ /* <Insert> is equal to "i" */
if (cap->cmdchar == K_INS || cap->cmdchar == K_KINS) if (cap->cmdchar == K_INS || cap->cmdchar == K_KINS)
cap->cmdchar = 'i'; cap->cmdchar = 'i';
@ -9063,6 +9055,14 @@ nv_edit(cmdarg_T *cap)
clearopbeep(cap->oap); clearopbeep(cap->oap);
#endif #endif
} }
#ifdef FEAT_TERMINAL
else if (term_in_terminal_mode())
{
clearop(cap->oap);
term_leave_terminal_mode();
return;
}
#endif
else if (!curbuf->b_p_ma && !p_im) else if (!curbuf->b_p_ma && !p_im)
{ {
/* Only give this error when 'insertmode' is off. */ /* Only give this error when 'insertmode' is off. */

2
src/version.c
View File

@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
826,
/**/ /**/
825, 825,
/**/ /**/