updated for version 7.4.478

Problem:    Using byte length instead of character length for 'showbreak'.
Solution:   Compute the character length. (Marco Hinz)

diff --git a/src/charset.c b/src/charset.c
index 006caa2a5016b21487aa616183b63f9c08e35cd5..918f9a514225a6f67becf4ff6bb52aff5523f80a 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -1184,8 +1184,12 @@ 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 (*p_sbr != NUL)
+           {
+               colnr_T sbrlen = (colnr_T)MB_CHARLEN(p_sbr);
+               if (col >= sbrlen)
+                   col -= sbrlen;
+           }
            if (numberextra > 0)
                col = col % numberextra;
        }

diff --git a/src/version.c b/src/version.c
index d233c24e9aab73d7385f91188166d0f8833e7b34..fed16aa170a052263a47fb15ccb7c3ad8aa831db 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 */
+/**/
+    478,
 /**/
     477,
 /**/