commit 6cd3aeee4c0fbd0751122395af0ab895abda027e
author Bram Moolenaar <Bram@vim.org> Tue Jan 14 13:18:58 2014 +0100
committer Bram Moolenaar <Bram@vim.org> Tue Jan 14 13:18:58 2014 +0100
tree 2969ceff007c4341114aafe9f11cd4ee9cb8f227
parent 2cd3696c35877e2b3e8826336fb37833a3dfa4b6

updated for version 7.4.147
Problem:    Cursor moves to wrong position when using "gj" after "$" and
            virtual editing is active.
Solution:   Make "gj" behave differently when virtual editing is active.
            (Hirohito Higashi)

src/normal.c

diff --git a/src/normal.c b/src/normal.c
index f76aeee..66a5b7a 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -4644,7 +4644,10 @@
     }
 #endif
 
-    coladvance(curwin->w_curswant);
+    if (virtual_active() && atend)
+	coladvance(MAXCOL);
+    else
+	coladvance(curwin->w_curswant);
 
 #if defined(FEAT_LINEBREAK) || defined(FEAT_MBYTE)
     if (curwin->w_cursor.col > 0 && curwin->w_p_wrap)

src/testdir/test39.in

diff --git a/src/testdir/test39.in b/src/testdir/test39.in
index 4f42a13..8f45f47 100644
--- a/src/testdir/test39.in
+++ b/src/testdir/test39.in
Binary files differ

src/testdir/test39.ok

diff --git a/src/testdir/test39.ok b/src/testdir/test39.ok
index 3469f52..b459355 100644
--- a/src/testdir/test39.ok
+++ b/src/testdir/test39.ok
Binary files differ

src/version.c

diff --git a/src/version.c b/src/version.c
index 7be350c..c9fa779 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    147,
+/**/
     146,
 /**/
     145,