summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-10 16:00:53 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-10 16:00:53 +0100
commitb86a343280b08d6701da68ee0651e960a0a7a61c (patch)
tree356582cf6c33986a333421c8761e0eb60404930b
parentacb4f221c715a333f4c49a2235a8006c6ac6e4d5 (diff)
downloadvim-git-7.4.1079.tar.gz
patch 7.4.1079v7.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.
-rw-r--r--Filelist1
-rw-r--r--src/quickfix.c10
-rw-r--r--src/version.c2
3 files changed, 8 insertions, 5 deletions
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
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1079,
+/**/
1078,
/**/
1077,