mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
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)
This commit is contained in:
parent
3ee0229f64
commit
e4ebd29ea9
@ -6434,6 +6434,13 @@ screen_puts_len(text, len, row, col, attr)
|
|||||||
else
|
else
|
||||||
prev_c = u8c;
|
prev_c = u8c;
|
||||||
# endif
|
# 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
|
#endif
|
||||||
@ -9210,7 +9217,7 @@ unshowmode(force)
|
|||||||
int 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))
|
if (!redrawing() || (!force && char_avail() && !KeyTyped))
|
||||||
redraw_cmdline = TRUE; /* delete mode later */
|
redraw_cmdline = TRUE; /* delete mode later */
|
||||||
|
@ -681,6 +681,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
341,
|
||||||
/**/
|
/**/
|
||||||
340,
|
340,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user