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 fcc41ec334f72100db5684e743bc444066fbffb7..006caa2a5016b21487aa616183b63f9c08e35cd5 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 (*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 f22d195a1b12bd8dcfee9de3e1acc32746917849..d7c4cc0999147b4de2f7ec91fcc0c83147eadd5a 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 */
+/**/
+    473,
 /**/
     472,
 /**/