summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-06-13 20:23:53 +0200
committerBram Moolenaar <Bram@vim.org>2016-06-13 20:23:53 +0200
commitbf2c0ee0b2e8465847cf67aff22dd4bda7be81d1 (patch)
tree651a3734577bbe719121598a05385ca94c11fcf9
parent2016ae586b12513d973aabc30ed758b543114cbe (diff)
downloadvim-git-bf2c0ee0b2e8465847cf67aff22dd4bda7be81d1.tar.gz
patch 7.4.1930v7.4.1930
Problem: Can't build without +spell but with +quickfix. (Charles) Solution: Add better #ifdef around ml_append_buf(). (closes #864)
-rw-r--r--src/memline.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/memline.c b/src/memline.c
index 1c2ddbf7b..2dd465ae7 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -2542,7 +2542,8 @@ ml_append(
return ml_append_int(curbuf, lnum, line, len, newfile, FALSE);
}
-#if defined(FEAT_SPELL) || defined(PROTO)
+#if defined(FEAT_SPELL) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \
+ || defined(PROTO)
/*
* Like ml_append() but for an arbitrary buffer. The buffer must already have
* a memline.
diff --git a/src/version.c b/src/version.c
index de67ab2a5..b58bc3c34 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1930,
+/**/
1929,
/**/
1928,