summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-03-25 15:49:08 +0000
committerBram Moolenaar <Bram@vim.org>2007-03-25 15:49:08 +0000
commit4940e3f2c300428bac27fc4bef24c0f8e4a64648 (patch)
treef1d73099269f9265953ed82c77e92c6d9f50f18c
parent867a4b7630a0a35559611661d87689640ed39b80 (diff)
downloadvim-4940e3f2c300428bac27fc4bef24c0f8e4a64648.zip
updated for version 7.0-220
-rw-r--r--src/eval.c8
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index 4698024c2..93d039467 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -15769,7 +15769,15 @@ get_winnr(tp, argvar)
if (nr > 0)
for (wp = (tp == curtab) ? firstwin : tp->tp_firstwin;
wp != twin; wp = wp->w_next)
+ {
+ if (wp == NULL)
+ {
+ /* didn't find it in this tabpage */
+ nr = 0;
+ break;
+ }
++nr;
+ }
return nr;
}
#endif
diff --git a/src/version.c b/src/version.c
index d58ae293b..e223c49e8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 220,
+/**/
219,
/**/
218,