summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-09-11 11:26:56 +0000
committerBram Moolenaar <Bram@vim.org>2009-09-11 11:26:56 +0000
commitdc7e00e848573c792da9c63b1e4da71989771f5d (patch)
treebab2ccd14c99c0a09f3c628a21f6f1daed699d46
parent1c6136a8a5df97e57d8fbb79ea3658c5ecd0cdcd (diff)
downloadvim-git-dc7e00e848573c792da9c63b1e4da71989771f5d.tar.gz
updated for version 7.2-250v7.2.250
-rw-r--r--src/GvimExt/gvimext.cpp4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/GvimExt/gvimext.cpp b/src/GvimExt/gvimext.cpp
index d317e2fff..71d180ef9 100644
--- a/src/GvimExt/gvimext.cpp
+++ b/src/GvimExt/gvimext.cpp
@@ -635,7 +635,9 @@ STDMETHODIMP CShellExt::QueryContextMenu(HMENU hMenu,
}
// Now concatenate
strncpy(temp, _("Edit with existing Vim - "), BUFSIZE - 1);
- strncat(temp, title, BUFSIZE - 1);
+ temp[BUFSIZE - 1] = '\0';
+ strncat(temp, title, BUFSIZE - 1 - strlen(temp));
+ temp[BUFSIZE - 1] = '\0';
InsertMenu(hMenu,
indexMenu++,
MF_STRING|MF_BYPOSITION,
diff --git a/src/version.c b/src/version.c
index 30b7759fb..b0318481c 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 */
/**/
+ 250,
+/**/
249,
/**/
248,