summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-07-09 17:08:29 +0200
committerBram Moolenaar <bram@vim.org>2013-07-09 17:08:29 +0200
commit1407ff600fc4dc76df5d219f4f37bb613cd97fca (patch)
tree3c62afe49de87a60006b67e9751e3a7bb464756d
parentbdd2e0e93b25c3a7aebe36bfbd71fa3fbf31cd10 (diff)
downloadvim-7-4a-007.tar.gz
updated for version 7.4a.007v7.4a.007v7-4a-007
Problem: After "g$" with 'virtualedit' set, "k" moves to a different column. (Dimitar Dimitrov) Solution: Set w_curswant. (Christian Brabandt)
-rw-r--r--src/normal.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/normal.c b/src/normal.c
index b16ac872..762f3197 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -8220,6 +8220,11 @@ nv_g_cmd(cap)
i += ((curwin->w_virtcol - width1) / width2 + 1)
* width2;
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 (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 next screen line.
*/
- validate_virtcol();
if (curwin->w_virtcol > (colnr_T)i)
--curwin->w_cursor.col;
}
diff --git a/src/version.c b/src/version.c
index c26845e9..02086c76 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 7,
+/**/
6,
/**/
5,