Permalink
Browse files

patch 8.0.0826: cannot use text objects in Terminal mode

Problem:    Cannot use text objects in Terminal mode.
Solution:   Check for pending operator and Visual mode first. (Yasuhiro
            Matsumoto, closes #1906)
  • Loading branch information...
brammool committed Jul 31, 2017
1 parent 3633cf5 commit 662d93866636995c0564d974e554f96e76fb2dd9
Showing with 10 additions and 8 deletions.
  1. +8 −8 src/normal.c
  2. +2 −0 src/version.c
View
@@ -9037,14 +9037,6 @@ nv_esc(cmdarg_T *cap)
static void
nv_edit(cmdarg_T *cap)
{
#ifdef FEAT_TERMINAL
if (term_in_terminal_mode())
{
term_leave_terminal_mode();
return;
}
#endif
/* <Insert> is equal to "i" */
if (cap->cmdchar == K_INS || cap->cmdchar == K_KINS)
cap->cmdchar = 'i';
@@ -9063,6 +9055,14 @@ nv_edit(cmdarg_T *cap)
clearopbeep(cap->oap);
#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)
{
/* Only give this error when 'insertmode' is off. */
View
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
826,
/**/
825,
/**/

0 comments on commit 662d938

Please sign in to comment.