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.4a.007

Browse Source 
Problem:    After "g$" with 'virtualedit' set, "k" moves to a different
            column.  (Dimitar Dimitrov)
Solution:   Set w_curswant. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar 2013-07-09 17:08:29 +02:00
parent dd007ed585
commit b69510e889
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/normal.c
View File

@ -8220,6 +8220,11 @@ nv_g_cmd(cap)
i += ((curwin->w_virtcol - width1) / width2 + 1) i += ((curwin->w_virtcol - width1) / width2 + 1)
* width2; * width2;
coladvance((colnr_T)i); coladvance((colnr_T)i);
/* Make sure we stick in this column. */
validate_virtcol();
curwin->w_curswant = curwin->w_virtcol;
curwin->w_set_curswant = FALSE;
#if defined(FEAT_LINEBREAK) || defined(FEAT_MBYTE) #if defined(FEAT_LINEBREAK) || defined(FEAT_MBYTE)
if (curwin->w_cursor.col > 0 && curwin->w_p_wrap) if (curwin->w_cursor.col > 0 && curwin->w_p_wrap)
{ {
@ -8228,7 +8233,6 @@ nv_g_cmd(cap)
* the end of the line. We do not want to advance to * the end of the line. We do not want to advance to
* the next screen line. * the next screen line.
*/ */
validate_virtcol();
if (curwin->w_virtcol > (colnr_T)i) if (curwin->w_virtcol > (colnr_T)i)
--curwin->w_cursor.col; --curwin->w_cursor.col;
} }

2
src/version.c
View File

@ -728,6 +728,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 */
/**/
7,
/**/ /**/
6, 6,
/**/ /**/