Mercurial > vim
comparison src/charset.c @ 6288:fcb898dea2bc v7.4.478
updated for version 7.4.478
Problem: Using byte length instead of character length for 'showbreak'.
Solution: Compute the character length. (Marco Hinz)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Wed, 15 Oct 2014 21:26:40 +0200 |
parents | 1cdd5804b538 |
children | 31c78e590806 |
comparison
equal
deleted
inserted
replaced
6287:7f7353f0c7ac | 6288:fcb898dea2bc |
---|---|
1182 col += numberextra + mb_added; | 1182 col += numberextra + mb_added; |
1183 if (col >= (colnr_T)W_WIDTH(wp)) | 1183 if (col >= (colnr_T)W_WIDTH(wp)) |
1184 { | 1184 { |
1185 col -= W_WIDTH(wp); | 1185 col -= W_WIDTH(wp); |
1186 numberextra = W_WIDTH(wp) - (numberextra - win_col_off2(wp)); | 1186 numberextra = W_WIDTH(wp) - (numberextra - win_col_off2(wp)); |
1187 if (*p_sbr != NUL && col >= (colnr_T)STRLEN(p_sbr)) | 1187 if (*p_sbr != NUL) |
1188 col -= (colnr_T)STRLEN(p_sbr); | 1188 { |
1189 colnr_T sbrlen = (colnr_T)MB_CHARLEN(p_sbr); | |
1190 if (col >= sbrlen) | |
1191 col -= sbrlen; | |
1192 } | |
1189 if (numberextra > 0) | 1193 if (numberextra > 0) |
1190 col = col % numberextra; | 1194 col = col % numberextra; |
1191 } | 1195 } |
1192 if (col == 0 || col + size > (colnr_T)W_WIDTH(wp)) | 1196 if (col == 0 || col + size > (colnr_T)W_WIDTH(wp)) |
1193 { | 1197 { |