summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-04-29 22:33:27 +0200
committerBram Moolenaar <Bram@vim.org>2016-04-29 22:33:27 +0200
commitbb82762907ba024717ad9af3b229c2fa6405cd36 (patch)
treebd20900accf33bdad771c19aaed19c819e797ae4
parentc61348e83fd4eed8b999fe5b7cdfb4caf90bf3fd (diff)
patch 7.4.1798v7.4.1798
Problem: Still compiler warning for unused return value. (Charles Campbell) Solution: Assign to ignoredp.
-rw-r--r--src/term.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c
index cc9d7ad090..3c8c0fa02b 100644
--- a/src/term.c
+++ b/src/term.c
@@ -6177,7 +6177,7 @@ gui_get_color_cmn(char_u *name)
size_t len;
int pos;
- (void)fgets(line, LINE_LEN, fd);
+ ignoredp = fgets(line, LINE_LEN, fd);
len = strlen(line);
if (len <= 1 || line[len - 1] != '\n')
diff --git a/src/version.c b/src/version.c
index 4fb17c4408..44f37a7fc6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1798,
+/**/
1797,
/**/
1796,