updated for version 7.1-096

diff --git a/src/message.c b/src/message.c
index ba408a6d5b6b2c9dd52a78ddfa4c6454c15eb228..82b9c9aeaac9b8da3fad89bb3d91f66e0f5e5739 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -944,6 +944,7 @@ wait_return(redraw)
                c = K_IGNORE;
            }
 #endif
+
            /*
             * Allow scrolling back in the messages.
             * Also accept scroll-down commands when messages fill the screen,
@@ -1840,6 +1841,7 @@ msg_puts_display(str, maxlen, attr, recurse)
     char_u     *sb_str = str;
     int                sb_col = msg_col;
     int                wrap;
+    int                did_last_char;
 
     did_wait_return = FALSE;
     while ((maxlen < 0 || (int)(s - str) < maxlen) && *s != NUL)
@@ -1909,7 +1911,10 @@ msg_puts_display(str, maxlen, attr, recurse)
                else
 #endif
                    msg_screen_putchar(*s++, attr);
+               did_last_char = TRUE;
            }
+           else
+               did_last_char = FALSE;
 
            if (p_more)
                /* store text for scrolling back */
@@ -1944,11 +1949,7 @@ msg_puts_display(str, maxlen, attr, recurse)
 
            /* When we displayed a char in last column need to check if there
             * is still more. */
-           if (*s >= ' '
-#ifdef FEAT_RIGHTLEFT
-                   && !cmdmsg_rl
-#endif
-              )
+           if (did_last_char)
                continue;
        }
 

diff --git a/src/version.c b/src/version.c
index 82371a901a196bc93cb35d8f959c7830d9cb4e32..e1fc310cb393dd8c2d90d90c2ea8d208db8f9b44 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    96,
 /**/
     95,
 /**/