updated for version 7.2-235

diff --git a/src/misc1.c b/src/misc1.c
index f86a16781fd23242b13b5f7729dac5e6e07a6f09..23a1c1e4ba9109ce404d20e221d7b6454fe0b5f8 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -3276,6 +3276,7 @@ prompt_for_number(mouse_used)
        cmdline_row = msg_row - 1;
        need_wait_return = FALSE;
        msg_didany = FALSE;
+       msg_didout = FALSE;
     }
     else
        cmdline_row = save_cmdline_row;

diff --git a/src/spell.c b/src/spell.c
index de74f611857407328294cfeea77408c045b85f0e..033c353bc0f373057dc2a17859b693804c411c4b 100644 (file)
--- a/src/spell.c
+++ b/src/spell.c
@@ -10252,6 +10252,7 @@ spell_suggest(count)
     int                limit;
     int                selected = count;
     int                badlen = 0;
+    int                msg_scroll_save = msg_scroll;
 
     if (no_spell_checking(curwin))
        return;
@@ -10416,7 +10417,9 @@ spell_suggest(count)
        selected = prompt_for_number(&mouse_used);
        if (mouse_used)
            selected -= lines_left;
-       lines_left = Rows;      /* avoid more prompt */
+       lines_left = Rows;              /* avoid more prompt */
+       /* don't delay for 'smd' in normal_cmd() */
+       msg_scroll = msg_scroll_save;
     }
 
     if (selected > 0 && selected <= sug.su_ga.ga_len && u_save_cursor() == OK)
@@ -10441,7 +10444,8 @@ spell_suggest(count)
        }
 
        /* Replace the word. */
-       p = alloc((unsigned)STRLEN(line) - stp->st_orglen + stp->st_wordlen + 1);
+       p = alloc((unsigned)STRLEN(line) - stp->st_orglen
+                                                      + stp->st_wordlen + 1);
        if (p != NULL)
        {
            c = (int)(sug.su_badptr - line);

diff --git a/src/version.c b/src/version.c
index 3f07803e231cdd5b43bc1b5f0f3cff1d711595d8..8e5594266898e8a2b397184edd35b3dc11635a8b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    235,
 /**/
     234,
 /**/