Permalink
Browse files

patch 8.0.1113: can go to Insert mode from Terminal-Normal mode

Problem:    Can go to Insert mode from Terminal-Normal mode.
Solution:   Prevent :startinsert and "VA" to enter Insert mode. (Yasuhiro
            Matsumoto, closes #2092)
  • Loading branch information...
brammool committed Sep 16, 2017
1 parent fc2b270 commit eef9adddab4c7fc7bb1c54267e76849caf565edf
Showing with 15 additions and 2 deletions.
  1. +13 −2 src/normal.c
  2. +2 −0 src/version.c
View
@@ -1309,8 +1309,8 @@ normal_cmd(
#endif
#ifdef FEAT_TERMINAL
/* don't go to Insert mode from Terminal-Job mode */
if (term_use_loop())
/* don't go to Insert mode if a terminal has a running job */
if (term_job_running(curbuf->b_term))
restart_edit = 0;
#endif
@@ -9044,7 +9044,18 @@ nv_edit(cmdarg_T *cap)
/* in Visual mode "A" and "I" are an operator */
if (VIsual_active && (cap->cmdchar == 'A' || cap->cmdchar == 'I'))
{
#ifdef FEAT_TERMINAL
if (term_in_normal_mode())
{
end_visual_mode();
clearop(cap->oap);
term_enter_job_mode();
return;
}
#endif
v_visop(cap);
}
/* in Visual mode and after an operator "a" and "i" are for text objects */
else if ((cap->cmdchar == 'a' || cap->cmdchar == 'i')
View
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1113,
/**/
1112,
/**/

0 comments on commit eef9add

Please sign in to comment.