summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-03 17:22:49 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-03 17:22:49 +0100
commit9f7820f83bc994bbbecdca9483b355953f07179b (patch)
tree7fcf3b790416cd8497a59d859dffdc7b74488e0d
parent91715873d19a1859c08eeded7848113596e2f2bd (diff)
downloadvim-git-9f7820f83bc994bbbecdca9483b355953f07179b.tar.gz
patch 7.4.1481v7.4.1481
Problem: Can't build with small features. Solution: Add #ifdef.
-rw-r--r--src/ex_cmds2.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 73172cb08..f8ea8d67f 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -3057,6 +3057,7 @@ do_in_runtimepath(
return do_in_path(p_rtp, name, all ? DIP_ALL : 0, callback, cookie);
}
+#ifdef FEAT_AUTOCMD
/*
* Source filetype detection scripts, if filetype.vim was already done.
*/
@@ -3075,6 +3076,7 @@ may_do_filetypes(char_u *pat)
}
vim_free(cmd);
}
+#endif
static void
add_pack_plugin(char_u *fname, void *cookie)
@@ -3160,7 +3162,9 @@ source_packages()
{
do_in_path(p_pp, (char_u *)"pack/*/ever/*/plugin/*.vim",
DIP_ALL, add_pack_plugin, p_pp);
+#ifdef FEAT_AUTOCMD
may_do_filetypes((char_u *)"pack/*/ever/*/ftdetect/*.vim");
+#endif
}
/*
@@ -3181,8 +3185,10 @@ ex_loadplugin(exarg_T *eap)
vim_snprintf(pat, len, plugpat, eap->arg);
do_in_path(p_pp, (char_u *)pat, DIP_ALL, add_pack_plugin, p_pp);
+#ifdef FEAT_AUTOCMD
vim_snprintf(pat, len, ftpat, eap->arg);
may_do_filetypes((char_u *)pat);
+#endif
vim_free(pat);
}
diff --git a/src/version.c b/src/version.c
index 76ce46207..b7e0890f9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1481,
+/**/
1480,
/**/
1479,