summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2009-09-11 11:26:56 +0000
committervimboss <devnull@localhost>2009-09-11 11:26:56 +0000
commit8058b8dba2fc2308c4ca979806f459e32f574e7a (patch)
treebab2ccd14c99c0a09f3c628a21f6f1daed699d46
parent0c6770da1d4a5b954d5b858f516cac1030de0f13 (diff)
downloadvim-8058b8dba2fc2308c4ca979806f459e32f574e7a.tar.gz
updated for version 7.2-250v7.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 d317e2ff..71d180ef 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 30b7759f..b0318481 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,