diff options
author | Bram Moolenaar <Bram@vim.org> | 2006-09-05 13:37:47 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2006-09-05 13:37:47 +0000 |
commit | 53ed192b3c4a014c6bfe19a99623f5a2761a38d3 (patch) | |
tree | 9478d4811c7fe6bd1c76715a3b55d9642dcee3a8 | |
parent | 6abf17bc7e215650e87ca96216ac36683bc85b59 (diff) | |
download | vim-53ed192b3c4a014c6bfe19a99623f5a2761a38d3.zip |
updated for version 7.0-086
-rw-r--r-- | src/quickfix.c | 6 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/quickfix.c b/src/quickfix.c index 2e8737343..6c102d953 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -3426,8 +3426,10 @@ get_errorlist(wp, list) || dict_add_nr_str(dict, "col", (long)qfp->qf_col, NULL) == FAIL || dict_add_nr_str(dict, "vcol", (long)qfp->qf_viscol, NULL) == FAIL || dict_add_nr_str(dict, "nr", (long)qfp->qf_nr, NULL) == FAIL - || dict_add_nr_str(dict, "pattern", 0L, qfp->qf_pattern) == FAIL - || dict_add_nr_str(dict, "text", 0L, qfp->qf_text) == FAIL + || dict_add_nr_str(dict, "pattern", 0L, + qfp->qf_pattern == NULL ? (char_u *)"" : qfp->qf_pattern) == FAIL + || dict_add_nr_str(dict, "text", 0L, + qfp->qf_text == NULL ? (char_u *)"" : qfp->qf_text) == FAIL || dict_add_nr_str(dict, "type", 0L, buf) == FAIL || dict_add_nr_str(dict, "valid", (long)qfp->qf_valid, NULL) == FAIL) return FAIL; diff --git a/src/version.c b/src/version.c index a05edb1e0..21eb8707c 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 86, +/**/ 85, /**/ 84, |