From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 31 Oct 2014 11:42:01 +0000 (+0100)
Subject: updated for version 7.4.489
X-Git-Tag: v7.4.489
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe3c41009887331dc9fee2bedf457728117be544;p=thirdparty%2Fvim.git

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 918f9a5142..e9745c09a2 100644
--- 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 e720782c79..1ef081855a 100644
--- 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,
 /**/