summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-07 21:26:29 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-07 21:26:29 +0200
commite20b3eba731bafb97c609dd20a4c378c105acc0d (patch)
tree988d3623a23a41769c759129f3e1ac0d80cb4e4e /src
parent116a0f800c6a62e29c5af832df092507f1355c68 (diff)
patch 8.0.0889: gcc gives warnings for uninitialized variablesv8.0.0889
Problem: Gcc gives warnings for uninitialized variables. (Tony Mechelynck) Solution: Initialize variables even though they are not used.
Diffstat (limited to 'src')
-rw-r--r--src/terminal.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/terminal.c b/src/terminal.c
index 901bb9bed1..7029f49abc 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -2145,7 +2145,11 @@ f_term_scrape(typval_T *argvars, typval_T *rettv)
pos.row = get_row_number(&argvars[1], term);
if (term->tl_vterm != NULL)
+ {
screen = vterm_obtain_screen(term->tl_vterm);
+ p = NULL;
+ line = NULL;
+ }
else
{
linenr_T lnum = pos.row + term->tl_scrollback_scrolled;
diff --git a/src/version.c b/src/version.c
index 5a1660aa76..e5cafdce72 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 889,
+/**/
888,
/**/
887,