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

patch 7.4.1015

Browse Source 
Problem:    The column is not restored properly when the matchparen plugin is
            used in Insert mode and the cursor is after the end of the line.
Solution:   Set the curswant flag. (Christian Brabandt).  Also fix
            highlighting the match of the character before the cursor.
This commit is contained in:
Bram Moolenaar
2015-12-31 22:27:55 +01:00
parent 06b0734d9c
commit c21d67e33c
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/eval.c
View File

@@ -10183,6 +10183,7 @@ f_cursor(argvars, rettv)
#ifdef FEAT_VIRTUALEDIT
long coladd = 0;
#endif
int set_curswant = TRUE;
rettv->vval.v_number = -1;
if (argvars[1].v_type == VAR_UNKNOWN)
@@ -10198,7 +10199,10 @@ f_cursor(argvars, rettv)
coladd = pos.coladd;
#endif
if (curswant >= 0)
{
curwin->w_curswant = curswant - 1;
set_curswant = FALSE;
}
}
else
{
@@ -10231,7 +10235,7 @@ f_cursor(argvars, rettv)
mb_adjust_cursor();
#endif
curwin->w_set_curswant = TRUE;
curwin->w_set_curswant = set_curswant;
rettv->vval.v_number = 0;
}
@@ -17524,7 +17528,10 @@ f_setpos(argvars, rettv)
{
curwin->w_cursor = pos;
if (curswant >= 0)
{
curwin->w_curswant = curswant - 1;
curwin->w_set_curswant = FALSE;
}
check_cursor();
rettv->vval.v_number = 0;
}