summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-05-13 13:51:38 +0000
committerBram Moolenaar <Bram@vim.org>2006-05-13 13:51:38 +0000
commit9fb0e137ec9d15a614f5a0bfbeee0eebc70caa18 (patch)
treeaa719773ad9cda5bf150c1437818beb3a8fef284
parent6a1a37028e909c1a99900125cec0a07b3a788d69 (diff)
downloadvim-git-9fb0e137ec9d15a614f5a0bfbeee0eebc70caa18.tar.gz
updated for version 7.0-015v7.0.015
-rw-r--r--src/gui_at_fs.c60
-rw-r--r--src/version.c2
2 files changed, 32 insertions, 30 deletions
diff --git a/src/gui_at_fs.c b/src/gui_at_fs.c
index 3ded71152..ae6857526 100644
--- a/src/gui_at_fs.c
+++ b/src/gui_at_fs.c
@@ -1861,27 +1861,27 @@ SFvAreaSelectedCallback(w, n, pnew)
XtPointer pnew;
{
SFDir *dir;
- int nw;
+ int nw = (int)(long)pnew;
dir = &(SFdirs[SFdirPtr + (int)(long)n]);
#ifdef FEAT_GUI_NEXTAW
- if ((int)(long)pnew < 0)
+ if (nw < 0)
{
- if ((int)(long)pnew > -SFvScrollHeight)
- (int)(long)pnew = -1;
+ if (nw > -SFvScrollHeight)
+ nw = -1;
else
- (int)(long)pnew = -SFlistSize;
+ nw = -SFlistSize;
}
- else if ((int)(long)pnew > 0)
+ else if (nw > 0)
{
- if ((int)(long)pnew < SFvScrollHeight)
- (int)(long)pnew = 1;
+ if (nw < SFvScrollHeight)
+ nw = 1;
else
- (int)(long)pnew = SFlistSize;
+ nw = SFlistSize;
}
#endif
- nw = dir->vOrigin + (int)(long)pnew;
+ nw += dir->vOrigin;
if (nw > dir->nEntries - SFlistSize)
nw = dir->nEntries - SFlistSize;
@@ -1941,27 +1941,27 @@ SFhAreaSelectedCallback(w, n, pnew)
XtPointer pnew;
{
SFDir *dir;
- int nw;
+ int nw = (int)(long)pnew;
dir = &(SFdirs[SFdirPtr + (int)(long)n]);
#ifdef FEAT_GUI_NEXTAW
- if ((int)(long)pnew < 0)
+ if (nw < 0)
{
- if ((int)(long)pnew > -SFhScrollWidth)
- (int)(long)pnew = -1;
+ if (nw > -SFhScrollWidth)
+ nw = -1;
else
- (int)(long)pnew = -SFcharsPerEntry;
+ nw = -SFcharsPerEntry;
}
- else if ((int)(long)pnew > 0)
+ else if (nw > 0)
{
- if ((int)(long)pnew < SFhScrollWidth)
- (int)(long)pnew = 1;
+ if (nw < SFhScrollWidth)
+ nw = 1;
else
- (int)(long)pnew = SFcharsPerEntry;
+ nw = SFcharsPerEntry;
}
#endif
- nw = dir->hOrigin + (int)(long)pnew;
+ nw += dir->hOrigin;
if (nw > dir->nChars - SFcharsPerEntry)
nw = dir->nChars - SFcharsPerEntry;
@@ -2038,26 +2038,26 @@ SFpathAreaSelectedCallback(w, client_data, pnew)
XtPointer client_data;
XtPointer pnew;
{
- int nw;
+ int nw = (int)(long)pnew;
float f;
#ifdef FEAT_GUI_NEXTAW
- if ((int)(long)pnew < 0)
+ if (nw < 0)
{
- if ((int)(long)pnew > -SFpathScrollWidth)
- (int)(long)pnew = -1;
+ if (nw > -SFpathScrollWidth)
+ nw = -1;
else
- (int)(long)pnew = -3;
+ nw = -3;
}
- else if ((int)(long)pnew > 0)
+ else if (nw > 0)
{
- if ((int)(long)pnew < SFpathScrollWidth)
- (int)(long)pnew = 1;
+ if (nw < SFpathScrollWidth)
+ nw = 1;
else
- (int)(long)pnew = 3;
+ nw = 3;
}
#endif
- nw = SFdirPtr + (int)(long)pnew;
+ nw += SFdirPtr;
if (nw > SFdirEnd - 3)
nw = SFdirEnd - 3;
diff --git a/src/version.c b/src/version.c
index 504e74296..2e8714b6e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 15,
+/**/
14,
/**/
13,