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)

diff --git a/src/screen.c b/src/screen.c
index 79980e90fdb8a4ddd436e60da56acace8a2f0619..d461cedeee7bce96811d51bdeb8448a46eeeb09f 100644 (file)
--- 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 355549baafbec5aab92ca942a820e08dab2b6c97..7f35caadb0a1f75438416de46239519bbfb5bb92 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    341,
 /**/
     340,
 /**/