updated for version 7.2-225

diff --git a/src/getchar.c b/src/getchar.c
index 0947f35feb68dc158ee3ea532f202df8c1975959..e050601cfcf5069d15692fe86507019d712ef3be 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1309,6 +1309,9 @@ save_typebuf()
     return OK;
 }
 
+static int old_char = -1;      /* character put back by vungetc() */
+static int old_mod_mask;       /* mod_mask for ungotten character */
+
 #if defined(FEAT_EVAL) || defined(FEAT_EX_EXTRA) || defined(PROTO)
 
 /*
@@ -1323,6 +1326,10 @@ save_typeahead(tp)
     if (!tp->typebuf_valid)
        typebuf = tp->save_typebuf;
 
+    tp->old_char = old_char;
+    tp->old_mod_mask = old_mod_mask;
+    old_char = -1;
+
     tp->save_stuffbuff = stuffbuff;
     stuffbuff.bh_first.b_next = NULL;
 # ifdef USE_INPUT_BUF
@@ -1344,6 +1351,9 @@ restore_typeahead(tp)
        typebuf = tp->save_typebuf;
     }
 
+    old_char = tp->old_char;
+    old_mod_mask = tp->old_mod_mask;
+
     free_buff(&stuffbuff);
     stuffbuff = tp->save_stuffbuff;
 # ifdef USE_INPUT_BUF
@@ -1499,9 +1509,6 @@ updatescript(c)
 #define KL_PART_KEY -1         /* keylen value for incomplete key-code */
 #define KL_PART_MAP -2         /* keylen value for incomplete mapping */
 
-static int old_char = -1;      /* character put back by vungetc() */
-static int old_mod_mask;       /* mod_mask for ungotten character */
-
 /*
  * Get the next input character.
  * Can return a special key or a multi-byte character.

diff --git a/src/structs.h b/src/structs.h
index 6d6c1d838ab33c299e785e2a18f982319946eb61..658e098e1fe920ec60d6d4c94727e5531ece61e4 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -882,6 +882,8 @@ typedef struct
 {
     typebuf_T          save_typebuf;
     int                        typebuf_valid;      /* TRUE when save_typebuf valid */
+    int                        old_char;
+    int                        old_mod_mask;
     struct buffheader  save_stuffbuff;
 #ifdef USE_INPUT_BUF
     char_u             *save_inputbuf;

diff --git a/src/version.c b/src/version.c
index f3e9b2b7bee6a80642b9794ec18bceb2ad466a7d..be798216dd2269170ad5eb7d667454bdb37fe355 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 */
+/**/
+    225,
 /**/
     224,
 /**/