summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-08-10 17:25:51 +0200
committerBram Moolenaar <Bram@vim.org>2011-08-10 17:25:51 +0200
commit17fb0e891a0aee09a2c27660eb0ea489520aaa56 (patch)
tree35c865b19f5a0cea1d948c447246ae03b6b6c208
parent8c85fa3b2659a01fc1462ea26140ad2d0622e5b0 (diff)
downloadvim-git-17fb0e891a0aee09a2c27660eb0ea489520aaa56.tar.gz
updated for version 7.3.278v7.3.278
Problem: Passing the file name to open in VisVim doesn't work. Solution: Adjust the index and check for end of buffer. (Jiri Sedlak)
-rw-r--r--src/VisVim/Commands.cpp5
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/VisVim/Commands.cpp b/src/VisVim/Commands.cpp
index a346dea70..111b163c4 100644
--- a/src/VisVim/Commands.cpp
+++ b/src/VisVim/Commands.cpp
@@ -549,7 +549,7 @@ static BOOL VimOpenFile(BSTR& FileName, long LineNr)
if (g_bNewTabs)
{
sprintf(VimCmd, ":tab drop ");
- s = VimCmd + 11;
+ s = VimCmd + 10;
}
else
{
@@ -557,8 +557,7 @@ static BOOL VimOpenFile(BSTR& FileName, long LineNr)
s = VimCmd + 6;
}
sprintf(FileNameTmp, "%S", (char *)FileName);
- for (p = FileNameTmp; *p != '\0' && s < FileNameTmp + MAX_OLE_STR - 4;
- ++p)
+ for (p = FileNameTmp; *p != '\0' && s < VimCmd + MAX_OLE_STR - 4; ++p)
if (*p == '\\')
*s++ = '/';
else
diff --git a/src/version.c b/src/version.c
index 517310e2c..e009b8575 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 278,
+/**/
277,
/**/
276,