updated for version 7.0-015

diff --git a/src/gui_at_fs.c b/src/gui_at_fs.c
index 3ded711522c37243a8588f6c64283a0c113ec257..ae68575266010dddacc4dac7718e45a8b8bb0240 100644 (file)
--- 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 504e742965708b4117d6f7ca40dfa42c80ac3524..2e8714b6e9c65724542d4da149983bc6710c54cf 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    15,
 /**/
     14,
 /**/