Skip to content

Commit 3a29abc

Browse files
committed
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
1 parent f13e00b commit 3a29abc

2 files changed

Lines changed: 9 additions & 12 deletions

File tree

src/evalfunc.c

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10136,20 +10136,15 @@ f_setpos(typval_T *argvars, typval_T *rettv)
1013610136
pos.col = 0;
1013710137
if (name[0] == '.' && name[1] == NUL)
1013810138
{
10139-
/* set cursor */
10140-
if (fnum == curbuf->b_fnum)
10139+
/* set cursor; "fnum" is ignored */
10140+
curwin->w_cursor = pos;
10141+
if (curswant >= 0)
1014110142
{
10142-
curwin->w_cursor = pos;
10143-
if (curswant >= 0)
10144-
{
10145-
curwin->w_curswant = curswant - 1;
10146-
curwin->w_set_curswant = FALSE;
10147-
}
10148-
check_cursor();
10149-
rettv->vval.v_number = 0;
10143+
curwin->w_curswant = curswant - 1;
10144+
curwin->w_set_curswant = FALSE;
1015010145
}
10151-
else
10152-
EMSG(_(e_invarg));
10146+
check_cursor();
10147+
rettv->vval.v_number = 0;
1015310148
}
1015410149
else if (name[0] == '\'' && name[1] != NUL && name[2] == NUL)
1015510150
{

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
256,
767769
/**/
768770
255,
769771
/**/

0 commit comments

Comments
 (0)