updated for version 7.0-150

diff --git a/src/term.c b/src/term.c
index 9fcce2b6a2f0fc4e9ed0a46326ba5c28eaed0c2f..1872852612129f107de915d2d54a02c7c57c79b2 100644 (file)
--- 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 dc1510aeebd4d4453d214a7189b6334c52c25d08..4a50d812a91df9e93a7149a455dbec222f041296 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 */
+/**/
+    150,
 /**/
     149,
 /**/