updated for version 7.2b-022

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 7247d8cbc3425489be715d309e4904c9e01b3721..07dcb774ac465788423dfe6eb08c8527b3bc696a 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -8913,6 +8913,7 @@ ex_normal(eap)
     tasave_T   tabuf;
     int                save_insertmode = p_im;
     int                save_finish_op = finish_op;
+    int                save_opcount = opcount;
 #ifdef FEAT_MBYTE
     char_u     *arg = NULL;
     int                l;
@@ -9040,6 +9041,7 @@ ex_normal(eap)
     restart_edit = save_restart_edit;
     p_im = save_insertmode;
     finish_op = save_finish_op;
+    opcount = save_opcount;
     msg_didout |= save_msg_didout;     /* don't reset msg_didout now */
 
     /* Restore the state (needed when called from a function executed for

diff --git a/src/globals.h b/src/globals.h
index b31e05436b55b79bb352ec00e1f2299f271e4ee8..dc3038d827055b2058af543504d9b403c76e5226 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -868,6 +868,7 @@ EXTERN int  State INIT(= NORMAL);   /* This is the current state of the
                                         * command interpreter. */
 
 EXTERN int     finish_op INIT(= FALSE);/* TRUE while an operator is pending */
+EXTERN int     opcount INIT(= 0);      /* count for pending operator */
 
 /*
  * ex mode (Q) state

diff --git a/src/normal.c b/src/normal.c
index 3c1c6f064fec078f5e730dce25beb497490e0e1c..a1b3a945f4af71262f4f6019c98b922557657c0d 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -565,7 +565,6 @@ normal_cmd(oap, toplevel)
     oparg_T    *oap;
     int                toplevel;               /* TRUE when called from main() */
 {
-    static long        opcount = 0;            /* ca.opcount saved here */
     cmdarg_T   ca;                     /* command arguments */
     int                c;
     int                ctrl_w = FALSE;         /* got CTRL-W command */

diff --git a/src/version.c b/src/version.c
index f6843cb0fa9235e40dbf1f0aaae20803e194a629..0535785e38dac3e0fe58d586c5a7f05bad9d9915 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    22,
 /**/
     21,
 /**/