Mercurial > vim
changeset 2055:4aa4510d548c v7.2.341
updated for version 7.2.341
Problem: Popup menu wraps to next line when double-wide character doesn't
fit. (Jiang Ma)
Solution: Display a ">" instead. (Dominique Pelle)
| author | Bram Moolenaar <bram@zimbu.org> |
|---|---|
| date | Tue, 19 Jan 2010 17:40:46 +0100 |
| parents | 79b8d69a4588 |
| children | e9e3355861ba |
| files | src/screen.c src/version.c |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -6434,6 +6434,13 @@ screen_puts_len(text, len, row, col, att else prev_c = u8c; # endif + if (col + mbyte_cells > screen_Columns) + { + /* Only 1 cell left, but character requires 2 cells: + * display a '>' in the last column to avoid wrapping. */ + c = '>'; + mbyte_cells = 1; + } } } #endif @@ -9210,7 +9217,7 @@ unshowmode(force) int force; { /* - * Don't delete it right now, when not redrawing or insided a mapping. + * Don't delete it right now, when not redrawing or inside a mapping. */ if (!redrawing() || (!force && char_avail() && !KeyTyped)) redraw_cmdline = TRUE; /* delete mode later */