diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-07-22 09:04:20 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-07-22 09:04:20 +0000 |
| commit | b245016c15abdaf65c15696c8abff188650734cd (patch) | |
| tree | a43b6cbf2ed781f9b53b38694a29405eee155802 | |
| parent | 055a2ba10e52141200da0e3d9f66a030841275b5 (diff) | |
updated for version 7.2-235v7.2.235
| -rw-r--r-- | src/misc1.c | 1 | ||||
| -rw-r--r-- | src/spell.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/misc1.c b/src/misc1.c index f86a16781f..23a1c1e4ba 100644 --- 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 de74f61185..033c353bc0 100644 --- 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 3f07803e23..8e55942668 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 235, +/**/ 234, /**/ 233, |