diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-10-24 19:36:02 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-10-24 19:36:02 +0000 |
| commit | 09ef47a32a0ea1b4b6f4885fcbbed1423e97764c (patch) | |
| tree | 53bfee6f1ee1fa4152ef80e2b1cb0c4c74fcbe2f /src | |
| parent | 2647063968d843306b4d897c9e333cb5fd9d5a25 (diff) | |
| download | vim-git-09ef47a32a0ea1b4b6f4885fcbbed1423e97764c.tar.gz | |
updated for version 7.0-150v7.0.150
Diffstat (limited to 'src')
| -rw-r--r-- | src/term.c | 33 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 22 insertions, 13 deletions
diff --git a/src/term.c b/src/term.c index 9fcce2b6a..187285261 100644 --- a/src/term.c +++ b/src/term.c @@ -3137,25 +3137,32 @@ set_shellsize(width, height, mustset) screenalloc(FALSE); repeat_message(); } - else if (State & CMDLINE) - { - update_screen(NOT_VALID); - redrawcmdline(); - } else { - update_topline(); -#if defined(FEAT_INS_EXPAND) - if (pum_visible()) +#ifdef FEAT_SCROLLBIND + if (curwin->w_p_scb) + do_check_scrollbind(TRUE); +#endif + if (State & CMDLINE) { - redraw_later(NOT_VALID); - ins_compl_show_pum(); /* This includes the redraw. */ + update_screen(NOT_VALID); + redrawcmdline(); } else + { + update_topline(); +#if defined(FEAT_INS_EXPAND) + if (pum_visible()) + { + redraw_later(NOT_VALID); + ins_compl_show_pum(); /* This includes the redraw. */ + } + else #endif - update_screen(NOT_VALID); - if (redrawing()) - setcursor(); + update_screen(NOT_VALID); + if (redrawing()) + setcursor(); + } } cursor_on(); /* redrawing may have switched it off */ } diff --git a/src/version.c b/src/version.c index dc1510aee..4a50d812a 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 150, +/**/ 149, /**/ 148, |