summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-12-17 14:55:01 +0100
committerBram Moolenaar <Bram@vim.org>2017-12-17 14:55:01 +0100
commitee219b0e9faab4b7159ed1725c5b82cea4f4d4f8 (patch)
tree0747f437d281c97bb250cd7cf238000a593c0918
parent9e1d399e63903c6f84d7888ad8d84ebf4e29d8a1 (diff)
patch 8.0.1399: warnings and errors when building tiny versionv8.0.1399
Problem: Warnings and errors when building tiny version. (Tony Mechelynck) Solution: Add #ifdefs.
-rw-r--r--src/ex_getln.c2
-rw-r--r--src/ops.c2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 405e1f655c..2a2b08ba2e 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -172,6 +172,7 @@ abandon_cmdline(void)
redraw_cmdline = TRUE;
}
+#ifdef FEAT_SEARCH_EXTRA
/*
* Guess that the pattern matches everything. Only finds specific cases, such
* as a trailing \|, which can happen while typing a pattern.
@@ -187,6 +188,7 @@ empty_pattern(char_u *p)
n -= 2;
return n == 0 || (n >= 2 && p[n - 2] == '\\' && p[n - 1] == '|');
}
+#endif
/*
* getcmdline() - accept a command line starting with firstc.
diff --git a/src/ops.c b/src/ops.c
index 1ecc67714d..cfa0bb367e 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -1645,6 +1645,7 @@ shift_delete_registers()
y_regs[1].y_array = NULL; /* set register one to empty */
}
+#ifdef FEAT_AUTOCMD
static void
yank_do_autocmd(oparg_T *oap, yankreg_T *reg)
{
@@ -1701,6 +1702,7 @@ yank_do_autocmd(oparg_T *oap, yankreg_T *reg)
dict_free_contents(v_event);
hash_init(&v_event->dv_hashtab);
}
+#endif
/*
* Handle a delete operation.
diff --git a/src/version.c b/src/version.c
index 2580b9ecc2..912e3be336 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1399,
+/**/
1398,
/**/
1397,