updated for version 7.3.879

Problem:    When using an ex command in operator pending mode, using Esc to
            abort the command still executes the operator. (David Bürgin)
Solution:   Clear the operator when the ex command fails. (Christian Brabandt)

diff --git a/src/normal.c b/src/normal.c
index d6c0abb11978714f7d0dfc5dd0ab3b3900d9162d..181dbcb35fd8c44890e56dc62fc432acf23e4894 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -5418,6 +5418,7 @@ nv_colon(cap)
     cmdarg_T  *cap;
 {
     int            old_p_im;
+    int            cmd_result;
 
 #ifdef FEAT_VISUAL
     if (VIsual_active)
@@ -5449,7 +5450,7 @@ nv_colon(cap)
        old_p_im = p_im;
 
        /* get a command line and execute it */
-       do_cmdline(NULL, getexline, NULL,
+       cmd_result = do_cmdline(NULL, getexline, NULL,
                            cap->oap->op_type != OP_NOP ? DOCMD_KEEPLINE : 0);
 
        /* If 'insertmode' changed, enter or exit Insert mode */
@@ -5461,12 +5462,17 @@ nv_colon(cap)
                restart_edit = 0;
        }
 
-       /* The start of the operator may have become invalid by the Ex
-        * command. */
-       if (cap->oap->op_type != OP_NOP
+       if (cmd_result == FAIL)
+           /* The Ex command failed, do not execute the operator. */
+           clearop(cap->oap);
+       else if (cap->oap->op_type != OP_NOP
                && (cap->oap->start.lnum > curbuf->b_ml.ml_line_count
                    || cap->oap->start.col >
-                              (colnr_T)STRLEN(ml_get(cap->oap->start.lnum))))
+                              (colnr_T)STRLEN(ml_get(cap->oap->start.lnum))
+                   || did_emsg
+                   ))
+           /* The start of the operator has become invalid by the Ex command.
+            */
            clearopbeep(cap->oap);
     }
 }

diff --git a/src/version.c b/src/version.c
index 8d3839ad5cb55336ce4304afc95ba0beb0334828..db39c93c06b4add5a6afd254159466c800dc86d9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    879,
 /**/
     878,
 /**/