aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.0-015

Browse Source
This commit is contained in:
Bram Moolenaar 2006-05-13 13:51:38 +00:00
parent 6a1a37028e
commit 9fb0e137ec
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/gui_at_fs.c
View File

@ -1861,27 +1861,27 @@ SFvAreaSelectedCallback(w, n, pnew)
XtPointer pnew; XtPointer pnew;
{ {
SFDir *dir; SFDir *dir;
int nw; int nw = (int)(long)pnew;
dir = &(SFdirs[SFdirPtr + (int)(long)n]); dir = &(SFdirs[SFdirPtr + (int)(long)n]);
#ifdef FEAT_GUI_NEXTAW #ifdef FEAT_GUI_NEXTAW
if ((int)(long)pnew < 0) if (nw < 0)
{ {
if ((int)(long)pnew > -SFvScrollHeight) if (nw > -SFvScrollHeight)
(int)(long)pnew = -1; nw = -1;
else else
(int)(long)pnew = -SFlistSize; nw = -SFlistSize;
} }
else if ((int)(long)pnew > 0) else if (nw > 0)
{ {
if ((int)(long)pnew < SFvScrollHeight) if (nw < SFvScrollHeight)
(int)(long)pnew = 1; nw = 1;
else else
(int)(long)pnew = SFlistSize; nw = SFlistSize;
} }
#endif #endif
nw = dir->vOrigin + (int)(long)pnew; nw += dir->vOrigin;
if (nw > dir->nEntries - SFlistSize) if (nw > dir->nEntries - SFlistSize)
nw = dir->nEntries - SFlistSize; nw = dir->nEntries - SFlistSize;
@ -1941,27 +1941,27 @@ SFhAreaSelectedCallback(w, n, pnew)
XtPointer pnew; XtPointer pnew;
{ {
SFDir *dir; SFDir *dir;
int nw; int nw = (int)(long)pnew;
dir = &(SFdirs[SFdirPtr + (int)(long)n]); dir = &(SFdirs[SFdirPtr + (int)(long)n]);
#ifdef FEAT_GUI_NEXTAW #ifdef FEAT_GUI_NEXTAW
if ((int)(long)pnew < 0) if (nw < 0)
{ {
if ((int)(long)pnew > -SFhScrollWidth) if (nw > -SFhScrollWidth)
(int)(long)pnew = -1; nw = -1;
else else
(int)(long)pnew = -SFcharsPerEntry; nw = -SFcharsPerEntry;
} }
else if ((int)(long)pnew > 0) else if (nw > 0)
{ {
if ((int)(long)pnew < SFhScrollWidth) if (nw < SFhScrollWidth)
(int)(long)pnew = 1; nw = 1;
else else
(int)(long)pnew = SFcharsPerEntry; nw = SFcharsPerEntry;
} }
#endif #endif
nw = dir->hOrigin + (int)(long)pnew; nw += dir->hOrigin;
if (nw > dir->nChars - SFcharsPerEntry) if (nw > dir->nChars - SFcharsPerEntry)
nw = dir->nChars - SFcharsPerEntry; nw = dir->nChars - SFcharsPerEntry;
@ -2038,26 +2038,26 @@ SFpathAreaSelectedCallback(w, client_data, pnew)
XtPointer client_data; XtPointer client_data;
XtPointer pnew; XtPointer pnew;
{ {
int nw; int nw = (int)(long)pnew;
float f; float f;
#ifdef FEAT_GUI_NEXTAW #ifdef FEAT_GUI_NEXTAW
if ((int)(long)pnew < 0) if (nw < 0)
{ {
if ((int)(long)pnew > -SFpathScrollWidth) if (nw > -SFpathScrollWidth)
(int)(long)pnew = -1; nw = -1;
else else
(int)(long)pnew = -3; nw = -3;
} }
else if ((int)(long)pnew > 0) else if (nw > 0)
{ {
if ((int)(long)pnew < SFpathScrollWidth) if (nw < SFpathScrollWidth)
(int)(long)pnew = 1; nw = 1;
else else
(int)(long)pnew = 3; nw = 3;
} }
#endif #endif
nw = SFdirPtr + (int)(long)pnew; nw += SFdirPtr;
if (nw > SFdirEnd - 3) if (nw > SFdirEnd - 3)
nw = SFdirEnd - 3; nw = SFdirEnd - 3;

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
15,
/**/ /**/
14, 14,
/**/ /**/