From ad739bd981346f21bb13e74b095aa820d34ad621 Mon Sep 17 00:00:00 2001 From: edyfox Date: Wed, 25 Oct 2006 06:30:31 +0000 Subject: [PATCH] Patch 7.0.150 Problem: When resizing the Vim window scrollbinding doesn't work. (Yakov Lerner) Solution: Do scrollbinding in set_shellsize(). Files: src/term.c git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/vim7@166 2a77ed30-b011-0410-a7ad-c7884a0aa172 --- src/term.c | 33 ++++++++++++++++++++------------- src/version.c | 2 ++ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/term.c b/src/term.c index 9fcce2b6..18728526 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 dc1510ae..4a50d812 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, -- 2.11.4.GIT