diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-20 00:55:59 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-20 00:55:59 -0400 |
| commit | 56cb1eb9f9579f56361a7208e776f5d15d4cdde7 (patch) | |
| tree | c863e36c392446a8a702b3919ffdca2e88ed8e79 /src | |
| parent | dc88173b1bf93237e52d88500676f8c911e94adb (diff) | |
| parent | 3e1ab7c8d6f3455b0e5e366ddb2dd8e1336cf470 (diff) | |
| download | rneovim-56cb1eb9f9579f56361a7208e776f5d15d4cdde7.tar.gz rneovim-56cb1eb9f9579f56361a7208e776f5d15d4cdde7.tar.bz2 rneovim-56cb1eb9f9579f56361a7208e776f5d15d4cdde7.zip | |
Merge pull request #4791 from brcolow/vim-7.4.1059
vim-patch:7.4.1059
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/quickfix.c | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c index 17cb8a86aa..151b9d3790 100644 --- a/src/nvim/quickfix.c +++ b/src/nvim/quickfix.c @@ -160,9 +160,6 @@ qf_init ( { qf_info_T *qi = &ql_info; - if (efile == NULL) - return FAIL; - if (wp != NULL) { qi = ll_get_or_alloc_list(wp); } diff --git a/src/nvim/version.c b/src/nvim/version.c index be66ba14fa..82a15f9833 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -625,7 +625,7 @@ static int included_patches[] = { // 1062 NA // 1061, // 1060 NA - // 1059, + 1059, // 1058, 1057, // 1056, |