summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-10-04 16:43:53 +0200
committerBram Moolenaar <Bram@vim.org>2011-10-04 16:43:53 +0200
commit7701c24e36d516d5f371160e632d26c88ef8f7c6 (patch)
tree897a2882f1e6bd6b6c1f179a11acec834bd37479
parent946c1eeafc01caa8525131f0939b901057221c82 (diff)
downloadvim-git-7701c24e36d516d5f371160e632d26c88ef8f7c6.tar.gz
updated for version 7.3.330v7.3.330
Problem: When longjmp() is invoked if the X server gives an error the state is not properly restored. Solution: Reset vgetc_busy. (Yukihiro Nakadaira)
-rw-r--r--src/main.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c
index 5d3e69920..2044893df 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1009,6 +1009,7 @@ main_loop(cmdwin, noexmode)
skip_redraw = FALSE;
RedrawingDisabled = 0;
no_wait_return = 0;
+ vgetc_busy = 0;
# ifdef FEAT_EVAL
emsg_skip = 0;
# endif
diff --git a/src/version.c b/src/version.c
index edf6aaab5..74a32d1d7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 330,
+/**/
329,
/**/
328,