From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 10 Oct 2014 13:34:33 +0000 (+0200)
Subject: updated for version 7.4.473
X-Git-Tag: v7.4.473
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5ead831a2a638f145d5a7ae88f72d8526cbbde1;p=vim

updated for version 7.4.473
Problem:    Cursor movement is incorrect when there is a number
            column/sign/fold column and 'sbr' is displayed.
Solution:   Adjust the column for 'sbr'. (Christian Brabandt)
---

diff --git a/src/charset.c b/src/charset.c
index fcc41ec33..006caa2a5 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 (*p_sbr != NUL && col >= (colnr_T)STRLEN(p_sbr))
+		col -= (colnr_T)STRLEN(p_sbr);
 	    if (numberextra > 0)
 		col = col % numberextra;
 	}
diff --git a/src/version.c b/src/version.c
index f22d195a1..d7c4cc099 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 */
+/**/
+    473,
 /**/
     472,
 /**/