aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlonerover <pathfinder1644@yahoo.com>2017-02-15 12:16:56 +0800
committerlonerover <pathfinder1644@yahoo.com>2017-02-15 12:18:44 +0800
commita926f10d45a317ff6dbf207056136c71fd293c08 (patch)
treed516e6e0ad3c3be9de6760ccff41d5a38f663b30
parent9380574cf7ef31ff6a134001b389e8eda9ae09af (diff)
downloadrneovim-a926f10d45a317ff6dbf207056136c71fd293c08.tar.gz
rneovim-a926f10d45a317ff6dbf207056136c71fd293c08.tar.bz2
rneovim-a926f10d45a317ff6dbf207056136c71fd293c08.zip
vim-patch:7.4.2047
Problem: Compiler warning for initializing a struct. Solution: Initialize in another way. (Anton Lindqvist) https://github.com/vim/vim/commit/bfafb4c4a01db3f8c508716daf689e0dfe92b649
-rw-r--r--src/nvim/quickfix.c4
-rw-r--r--src/nvim/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 413dda67ba..815a95c2bb 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -679,7 +679,7 @@ qf_init_ext(
size_t errmsglen;
char_u *pattern;
qfstate_T state = { NULL, 0, NULL, 0, NULL, NULL, NULL, NULL,
- NULL, lnumfirst, lnumlast };
+ NULL, 0, 0 };
int col = 0;
bool use_viscol = false;
char_u type = 0;
@@ -776,6 +776,8 @@ qf_init_ext(
state.tv = tv;
}
state.buf = buf;
+ state.buflnum = lnumfirst;
+ state.lnumlast = lnumlast;
/*
* Read the lines in the error file one by one.
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 3029ac986c..f6b1482e04 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -393,7 +393,7 @@ static int included_patches[] = {
2050,
2049,
// 2048 NA
- // 2047,
+ 2047,
2046,
// 2045 NA
// 2044,