# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1561515305 -7200
# Node ID db81cee3a0e1924b36f4d2c593f5c24c680722e3
# Parent  8b52f72f0618f3c4dc4fcc04c4105243a2b6f684
patch 8.1.1599: compiler warning for uninitialized variable

commit https://github.com/vim/vim/commit/6efd76ae4a5cb60facd261abd5d64800ec96402d
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Jun 26 04:06:57 2019 +0200

    patch 8.1.1599: compiler warning for uninitialized variable

    Problem:    Compiler warning for uninitialized variable. (Tony Mechelynck)
    Solution:   Add a dummy assignment.

diff --git a/src/normal.c b/src/normal.c
--- a/src/normal.c
+++ b/src/normal.c
@@ -4560,9 +4560,9 @@ nv_mousescroll(cmdarg_T *cap)
 	    nv_scroll_line(cap);
 	}
 #ifdef FEAT_TEXT_PROP
-	if (bt_popup(wp->w_buffer))
-	{
-	    int	    height = wp->w_height;
+	if (bt_popup(curwin->w_buffer))
+	{
+	    int	    height = curwin->w_height;
 
 	    curwin->w_firstline = curwin->w_topline;
 	    popup_adjust_position(curwin);
diff --git a/src/popupwin.c b/src/popupwin.c
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2129,8 +2129,8 @@ update_popups(void (*win_update)(win_T *
     char_u  buf[MB_MAXBYTES];
     int	    row;
     int	    i;
-    int	    sb_thumb_top;
-    int	    sb_thumb_height;
+    int	    sb_thumb_top = 0;
+    int	    sb_thumb_height = 0;
     int	    attr_scroll = highlight_attr[HLF_PSB];
     int	    attr_thumb = highlight_attr[HLF_PST];
 
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1599,
+/**/
     1598,
 /**/
     1597,