summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-02-21 21:14:00 +0000
committerBram Moolenaar <Bram@vim.org>2009-02-21 21:14:00 +0000
commitec90622aaef8f0a7d9dba747a2aaa7897f6bc880 (patch)
tree4bf1b9c31518839790cb37c81559c6fb57a616ab
parent7670fa0ef1c23a80d6a016fd83d0ba655fb91b3d (diff)
downloadvim-git-ec90622aaef8f0a7d9dba747a2aaa7897f6bc880.tar.gz
updated for version 7.2-114v7.2.114
-rw-r--r--src/netbeans.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/netbeans.c b/src/netbeans.c
index 5fc42f21c..d3a5c595b 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -1924,7 +1924,7 @@ nb_do_cmd(
vim_free(path);
if (bufp == NULL)
{
- nbdebug((" File %s not found in setBufferNumber\n", args));
+ nbdebug((" File %s not found in setBufferNumber\n", args));
EMSG2("E642: File %s not found in setBufferNumber", args);
return FAIL;
}
@@ -2318,7 +2318,7 @@ nb_do_cmd(
}
if (pos)
{
- coloncmd(":sign place %d line=%d name=%d buffer=%d",
+ coloncmd(":sign place %d line=%ld name=%d buffer=%d",
serNum, pos->lnum, typeNum, buf->bufp->b_fnum);
if (typeNum == curPCtype)
coloncmd(":sign jump %d buffer=%d", serNum,
@@ -2422,7 +2422,7 @@ nb_do_cmd(
GUARDED) == 0)
{
coloncmd(
- ":sign place %d line=%d name=%d buffer=%d",
+ ":sign place %d line=%ld name=%d buffer=%d",
guardId++, lnum, GUARDED,
buf->bufp->b_fnum);
}
diff --git a/src/version.c b/src/version.c
index 89ecba0ef..84c0f8295 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 */
/**/
+ 114,
+/**/
113,
/**/
112,