updated for version 7.4.489

Problem:    Cursor movement still wrong when 'lbr' is set and there is a
            number column. (Hirohito Higashi)
Solution:   Add correction for number column. (Hiroyuki Takagi)

diff --git a/src/charset.c b/src/charset.c
index 918f9a514225a6f67becf4ff6bb52aff5523f80a..e9745c09a243497823cb18fa6ea9b03a8aad5173 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -1184,6 +1184,8 @@ win_lbr_chartabsize(wp, line, s, col, headp)
        {
            col -= W_WIDTH(wp);
            numberextra = W_WIDTH(wp) - (numberextra - win_col_off2(wp));
+           if (numberextra > 0)
+               col %= numberextra;
            if (*p_sbr != NUL)
            {
                colnr_T sbrlen = (colnr_T)MB_CHARLEN(p_sbr);

diff --git a/src/version.c b/src/version.c
index e720782c79b5d6ca59850aaa861d17d66b72f9c2..1ef081855a4263084a16215d23727dd15bb09e25 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    489,
 /**/
     488,
 /**/