summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-02-21 23:03:09 +0000
committerBram Moolenaar <Bram@vim.org>2009-02-21 23:03:09 +0000
commitbb9c7d1cc537369bfd3098dd7a499aadbc648673 (patch)
treea77df7f4cadedb08ce51f0fc1c12dab0bca85eaa
parent086fad3a270a0ac4ca214454b3d9a0c8643d5f46 (diff)
downloadvim-git-bb9c7d1cc537369bfd3098dd7a499aadbc648673.tar.gz
updated for version 7.2-117v7.2.117
-rw-r--r--src/buffer.c3
-rw-r--r--src/quickfix.c3
-rw-r--r--src/screen.c5
-rw-r--r--src/version.c2
4 files changed, 10 insertions, 3 deletions
diff --git a/src/buffer.c b/src/buffer.c
index b510bf963..a052e12c6 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5098,7 +5098,8 @@ buf_spname(buf)
*/
FOR_ALL_TAB_WINDOWS(tp, win)
if (win->w_buffer == buf)
- break;
+ goto win_found;
+win_found:
if (win != NULL && win->w_llist_ref != NULL)
return _("[Location List]");
else
diff --git a/src/quickfix.c b/src/quickfix.c
index 5c3ae381e..5f69a925b 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -1610,10 +1610,11 @@ qf_jump(qi, dir, errornr, forceit)
{
goto_tabpage_win(tp, wp);
usable_win = 1;
- break;
+ goto win_found;
}
}
}
+win_found:
/*
* If there is only one window and it is the quickfix window, create a
diff --git a/src/screen.c b/src/screen.c
index 72e20ba7f..2ba06e20f 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7452,10 +7452,13 @@ screenalloc(clear)
{
outofmem = TRUE;
#ifdef FEAT_WINDOWS
- break;
+ goto give_up;
#endif
}
}
+#ifdef FEAT_WINDOWS
+give_up:
+#endif
#ifdef FEAT_MBYTE
for (i = 0; i < p_mco; ++i)
diff --git a/src/version.c b/src/version.c
index 86b7fb227..1e5d6f6b1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 117,
+/**/
116,
/**/
115,