1
0
forked from aniani/vim

updated for version 7.2-225

This commit is contained in:
Bram Moolenaar
2009-07-09 16:24:19 +00:00
parent 031e0dd663
commit 13df0fea4b
3 changed files with 14 additions and 3 deletions

View File

@@ -1309,6 +1309,9 @@ save_typebuf()
return OK; 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) #if defined(FEAT_EVAL) || defined(FEAT_EX_EXTRA) || defined(PROTO)
/* /*
@@ -1323,6 +1326,10 @@ save_typeahead(tp)
if (!tp->typebuf_valid) if (!tp->typebuf_valid)
typebuf = tp->save_typebuf; typebuf = tp->save_typebuf;
tp->old_char = old_char;
tp->old_mod_mask = old_mod_mask;
old_char = -1;
tp->save_stuffbuff = stuffbuff; tp->save_stuffbuff = stuffbuff;
stuffbuff.bh_first.b_next = NULL; stuffbuff.bh_first.b_next = NULL;
# ifdef USE_INPUT_BUF # ifdef USE_INPUT_BUF
@@ -1344,6 +1351,9 @@ restore_typeahead(tp)
typebuf = tp->save_typebuf; typebuf = tp->save_typebuf;
} }
old_char = tp->old_char;
old_mod_mask = tp->old_mod_mask;
free_buff(&stuffbuff); free_buff(&stuffbuff);
stuffbuff = tp->save_stuffbuff; stuffbuff = tp->save_stuffbuff;
# ifdef USE_INPUT_BUF # ifdef USE_INPUT_BUF
@@ -1499,9 +1509,6 @@ updatescript(c)
#define KL_PART_KEY -1 /* keylen value for incomplete key-code */ #define KL_PART_KEY -1 /* keylen value for incomplete key-code */
#define KL_PART_MAP -2 /* keylen value for incomplete mapping */ #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. * Get the next input character.
* Can return a special key or a multi-byte character. * Can return a special key or a multi-byte character.

View File

@@ -882,6 +882,8 @@ typedef struct
{ {
typebuf_T save_typebuf; typebuf_T save_typebuf;
int typebuf_valid; /* TRUE when save_typebuf valid */ int typebuf_valid; /* TRUE when save_typebuf valid */
int old_char;
int old_mod_mask;
struct buffheader save_stuffbuff; struct buffheader save_stuffbuff;
#ifdef USE_INPUT_BUF #ifdef USE_INPUT_BUF
char_u *save_inputbuf; char_u *save_inputbuf;

View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
225,
/**/ /**/
224, 224,
/**/ /**/