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
index 5bd2e5ee4bd7935228a9659f8fa35a8b64635593..0ab3db43004c619dab9958af6e6dc2f14b4d7aae 100644 (file)
--- 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))
+       if (bt_popup(curwin->w_buffer))
        {
-           int     height = wp->w_height;
+           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
index 5611cba6b7fb1a1ee4cbd821452485655c8ef753..2158a8036d244fd17b82d51d7241057e7a201222 100644 (file)
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2129,8 +2129,8 @@ update_popups(void (*win_update)(win_T *wp))
     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
index f74cb66db691755c15a86c65bb4f60a71b7000b1..eada1792c7457f43f48651efdd43f874172d3021 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1599,
 /**/
     1598,
 /**/