From: Bram Moolenaar Date: Sun, 10 Jan 2016 15:00:53 +0000 (+0100) Subject: patch 7.4.1079 X-Git-Tag: v7.4.1079 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b86a343280b08d6701da68ee0651e960a0a7a61c;p=vim patch 7.4.1079 Problem: New include file missing from distribution. Missing changes to quickfix code. Solution: Add alloc.h to the list of distributed files. Use the enum in quickfix code. --- diff --git a/Filelist b/Filelist index d58c53c7a..a1ed826d2 100644 --- a/Filelist +++ b/Filelist @@ -7,6 +7,7 @@ SRC_ALL = \ .travis.yml \ appveyor.yml \ src/README.txt \ + src/alloc.h \ src/arabic.c \ src/arabic.h \ src/ascii.h \ diff --git a/src/quickfix.c b/src/quickfix.c index e231fdfe9..003d0075d 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -250,9 +250,9 @@ qf_init_ext(qi, efile, buf, tv, errorformat, newlist, lnumfirst, lnumlast, {'s', ".\\+"} }; - namebuf = alloc_id(CMDBUFFSIZE + 1, 3); - errmsg = alloc_id(CMDBUFFSIZE + 1, 4); - pattern = alloc_id(CMDBUFFSIZE + 1, 5); + namebuf = alloc_id(CMDBUFFSIZE + 1, aid_qf_namebuf); + errmsg = alloc_id(CMDBUFFSIZE + 1, aid_qf_errmsg); + pattern = alloc_id(CMDBUFFSIZE + 1, aid_qf_pattern); if (namebuf == NULL || errmsg == NULL || pattern == NULL) goto qf_init_end; @@ -3462,8 +3462,8 @@ ex_vimgrep(eap) goto theend; } - dirname_start = alloc_id(MAXPATHL, 1); - dirname_now = alloc_id(MAXPATHL, 2); + dirname_start = alloc_id(MAXPATHL, aid_qf_dirname_start); + dirname_now = alloc_id(MAXPATHL, aid_qf_dirname_now); if (dirname_start == NULL || dirname_now == NULL) goto theend; diff --git a/src/version.c b/src/version.c index 891e61138..723dcf8a6 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1079, /**/ 1078, /**/