diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-26 04:06:57 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-26 04:06:57 +0200 |
| commit | 6efd76ae4a5cb60facd261abd5d64800ec96402d (patch) | |
| tree | cf7c87388453be4682ca652aa7e12d2f3bd80051 | |
| parent | 53a95d65840e9d48844fa0798f198eca765176e8 (diff) | |
| download | vim-git-6efd76ae4a5cb60facd261abd5d64800ec96402d.tar.gz | |
patch 8.1.1599: compiler warning for uninitialized variablev8.1.1599
Problem: Compiler warning for uninitialized variable. (Tony Mechelynck)
Solution: Add a dummy assignment.
| -rw-r--r-- | src/normal.c | 4 | ||||
| -rw-r--r-- | src/popupwin.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/normal.c b/src/normal.c index 5bd2e5ee4..0ab3db430 100644 --- 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 5611cba6b..2158a8036 100644 --- 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 f74cb66db..eada1792c 100644 --- 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, |