diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-31 22:56:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-31 22:56:24 +0200 |
| commit | 662d93866636995c0564d974e554f96e76fb2dd9 (patch) | |
| tree | e50bbba13c28b118477e3fcbaa6d0a02dfa2dc63 | |
| parent | 3633cf5201e914cc802fd2f813fa87bc959ffaec (diff) | |
| download | vim-git-662d93866636995c0564d974e554f96e76fb2dd9.tar.gz | |
patch 8.0.0826: cannot use text objects in Terminal modev8.0.0826
Problem: Cannot use text objects in Terminal mode.
Solution: Check for pending operator and Visual mode first. (Yasuhiro
Matsumoto, closes #1906)
| -rw-r--r-- | src/normal.c | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/normal.c b/src/normal.c index e8f80f181..d655c7467 100644 --- a/src/normal.c +++ b/src/normal.c @@ -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. */ diff --git a/src/version.c b/src/version.c index b2dfaa343..014dab616 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 826, +/**/ 825, /**/ 824, |