patch 8.0.0256: missing changes to one file breaks test

Problem:    Tests fail because some changes were not included.
Solution:   Add changes to evalfunc.c

diff --git a/src/evalfunc.c b/src/evalfunc.c
index a3441a0cc2064e9be549628f393a2aa988c880bb..6706fe17b7335426ea89f75f6e82fbcce88e79cc 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -10136,20 +10136,15 @@ f_setpos(typval_T *argvars, typval_T *rettv)
                pos.col = 0;
            if (name[0] == '.' && name[1] == NUL)
            {
-               /* set cursor */
-               if (fnum == curbuf->b_fnum)
+               /* set cursor; "fnum" is ignored */
+               curwin->w_cursor = pos;
+               if (curswant >= 0)
                {
-                   curwin->w_cursor = pos;
-                   if (curswant >= 0)
-                   {
-                       curwin->w_curswant = curswant - 1;
-                       curwin->w_set_curswant = FALSE;
-                   }
-                   check_cursor();
-                   rettv->vval.v_number = 0;
+                   curwin->w_curswant = curswant - 1;
+                   curwin->w_set_curswant = FALSE;
                }
-               else
-                   EMSG(_(e_invarg));
+               check_cursor();
+               rettv->vval.v_number = 0;
            }
            else if (name[0] == '\'' && name[1] != NUL && name[2] == NUL)
            {

diff --git a/src/version.c b/src/version.c
index 4d73ae64c883fa3a262676b38add8d529fd01299..58c9d29130011206152628ab93b86abfdff93800 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    256,
 /**/
     255,
 /**/