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)

diff --git a/src/normal.c b/src/normal.c
index 2b867bb19831d901fd5bf9d9c15c4ee271dc9d12..7bae34ed2fa322cc728821a4e3123b69dca5eea4 100644 (file)
--- 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 7d656a63136830ca439e301cfcd479558a866013..0a489126c034f96f9126a34e070a298c20ceaeea 100644 (file)
--- 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 ef4a45fb8569257bf01de318f5af7c5da1b9d182..daa911c43081a571691705290950fe01ef99c31e 100644 (file)
--- 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,
 /**/