summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-09-24 19:39:09 +0200
committerBram Moolenaar <Bram@vim.org>2017-09-24 19:39:09 +0200
commit0b05e491b473dbf39cd9f519030bf6363c272300 (patch)
treed684cbee2100fc534cd7d78862d0cbc61e220a50
parente0de17d84e1612dbc9362989194de5674f221de5 (diff)
patch 8.0.1144: using wrong #ifdef for computing lengthv8.0.1144
Problem: Using wrong #ifdef for computing length. Solution: use BACKSLASH_IN_FILENAME instead of COLON_IN_FILENAME. (Yasuhiro Matsomoto, closes #2153)
-rw-r--r--src/quickfix.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/quickfix.c b/src/quickfix.c
index 850fa7b6c8..8e76cbfcdc 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -443,8 +443,8 @@ parse_efm_option(char_u *efm)
i = (FMT_PATTERNS * 3) + ((int)STRLEN(efm) << 2);
for (round = FMT_PATTERNS; round > 0; )
i += (int)STRLEN(fmt_pat[--round].pattern);
-#ifdef COLON_IN_FILENAME
- i += 12; /* "%f" can become twelve chars longer */
+#ifdef BACKSLASH_IN_FILENAME
+ i += 12; /* "%f" can become twelve chars longer (see efm_to_regpat) */
#else
i += 2; /* "%f" can become two chars longer */
#endif
diff --git a/src/version.c b/src/version.c
index 1eb93ef28f..5509b928f0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1144,
+/**/
1143,
/**/
1142,