summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/screen.c9
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index 79980e90f..d461cedee 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -6434,6 +6434,13 @@ screen_puts_len(text, len, row, col, attr)
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 */
diff --git a/src/version.c b/src/version.c
index 355549baa..7f35caadb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 341,
+/**/
340,
/**/
339,