From 1c85210d6d0e426b6eb68972f12252804d509dd8 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 15 Oct 2014 21:26:40 +0200 Subject: [PATCH] updated for version 7.4.478 Problem: Using byte length instead of character length for 'showbreak'. Solution: Compute the character length. (Marco Hinz) --- src/charset.c | 8 ++++++-- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/charset.c b/src/charset.c index 006caa2a5..918f9a514 100644 --- 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 d233c24e9..fed16aa17 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 */ +/**/ + 478, /**/ 477, /**/ -- 2.40.0