From 0b5c93a7f266cd8c90ea27bdaf9f7214a95d64d7 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 1 Feb 2017 15:03:30 +0100 Subject: [PATCH] patch 8.0.0282: need to use CTRL-O twice when in Visual-Insert mode Problem: When doing a Visual selection and using "I" to go to insert mode, CTRL-O needs to be used twice to go to Normal mode. (Coacher) Solution: Check for the return value of edit(). (Christian Brabandt, closes #1290) --- src/normal.c | 2 ++ src/ops.c | 3 ++- src/version.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/normal.c b/src/normal.c index 2b867bb19..7bae34ed2 100644 --- a/src/normal.c +++ b/src/normal.c @@ -2041,6 +2041,8 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank) if (restart_edit == 0) restart_edit = restart_edit_save; + else + cap->retval |= CA_COMMAND_BUSY; } #else vim_beep(BO_OPER); diff --git a/src/ops.c b/src/ops.c index 7d656a631..0a489126c 100644 --- a/src/ops.c +++ b/src/ops.c @@ -2571,7 +2571,8 @@ op_insert(oparg_T *oap, long count1) } t1 = oap->start; - edit(NUL, FALSE, (linenr_T)count1); + if (edit(NUL, FALSE, (linenr_T)count1)) + return; /* When a tab was inserted, and the characters in front of the tab * have been converted to a tab as well, the column of the cursor diff --git a/src/version.c b/src/version.c index ef4a45fb8..daa911c43 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 282, /**/ 281, /**/ -- 2.40.0