diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-08-10 21:07:57 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-08-10 21:07:57 +0000 |
| commit | 0fa313a71870ccc2ba63da25a7abea850f5b3d02 (patch) | |
| tree | fc949b566e1d78f6eea570aab55c52b7d6a6b052 /src/gui.c | |
| parent | c388fbf9d99a8950c8c9a01466cfb8baa104ee8c (diff) | |
updated for version 7.0127v7.0127
Diffstat (limited to 'src/gui.c')
| -rw-r--r-- | src/gui.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1783,7 +1783,7 @@ gui_outstr(s, len) cells += (*mb_ptr2cells)(s + this_len); if (gui.col + cells > Columns) break; - this_len += (*mb_ptr2len_check)(s + this_len); + this_len += (*mb_ptr2len)(s + this_len); } if (this_len > len) this_len = len; /* don't include following composing char */ @@ -1847,7 +1847,7 @@ gui_screenchar(off, flags, fg, bg, back) /* Draw non-multi-byte character or DBCS character. */ return gui_outstr_nowrap(ScreenLines + off, - enc_dbcs ? (*mb_ptr2len_check)(ScreenLines + off) : 1, + enc_dbcs ? (*mb_ptr2len)(ScreenLines + off) : 1, flags, fg, bg, back); #else return gui_outstr_nowrap(ScreenLines + off, 1, flags, fg, bg, back); @@ -2190,7 +2190,7 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back) comping = utf_iscomposing(c); if (!comping) /* count cells from non-composing chars */ cells += cn; - cl = utf_ptr2len_check(s + i); + cl = utf_ptr2len(s + i); if (cl == 0) /* hit end of string */ len = i + cl; /* len must be wrong "cannot happen" */ @@ -2274,7 +2274,7 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back) /* Get the length in display cells, this can be different from the * number of bytes for "euc-jp". */ - for (i = 0; i < len; i += (*mb_ptr2len_check)(s + i)) + for (i = 0; i < len; i += (*mb_ptr2len)(s + i)) clen += (*mb_ptr2cells)(s + i); len = clen; } @@ -2508,7 +2508,7 @@ gui_redraw_block(row1, col1, row2, col2, flags) /* Stop at a double-byte single-width char. */ if (ScreenLines[off + idx] == 0x8e) break; - if (len > 1 && (*mb_ptr2len_check)(ScreenLines + if (len > 1 && (*mb_ptr2len)(ScreenLines + off + idx) == 2) ++idx; /* skip second byte of double-byte char */ } @@ -4559,7 +4559,7 @@ concat_esc(gap, text, what) while (*text != NUL) { #ifdef FEAT_MBYTE - int l = (*mb_ptr2len_check)(text); + int l = (*mb_ptr2len)(text); if (l > 1) { while (--l >= 0) |