summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2017-03-24 16:10:53 +0100
committerAdam Stankiewicz <sheerun@sher.pl>2017-03-24 16:10:53 +0100
commitef369d45a505403587ea0bae30ce6768ba51398c (patch)
tree9c7d077bc7f4a5849aa8837a682e828216e7be12
parent64938393bd49f459a3c64b8342c714caa836e6b3 (diff)
downloadvim-polyglot-2.15.1.tar.gz
vim-polyglot-2.15.1.zip
fix: Re-introduce config.vim into buildv2.15.1
-rwxr-xr-xbuild3
-rw-r--r--ftdetect/polyglot.vim11
2 files changed, 14 insertions, 0 deletions
diff --git a/build b/build
index 6cb99f58..c4e653c2 100755
--- a/build
+++ b/build
@@ -29,6 +29,9 @@ download() {
extract() {
printf "\n"
+
+ cat config.vim >> tmp/polyglot.vim
+
for pack in $1; do
name="$(printf "$pack" | cut -d ':' -f 1)"
path="$(printf "$pack" | cut -d ':' -f 2)"
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 63248b95..f4bd7e95 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1,3 +1,14 @@
+" Enable jsx syntax by default
+if !exists('g:jsx_ext_required')
+ let g:jsx_ext_required = 0
+endif
+
+" Disable json concealing by default
+if !exists('g:vim_json_syntax_conceal')
+ let g:vim_json_syntax_conceal = 0
+endif
+
+let g:filetype_euphoria = 'elixir'
augroup filetypedetect
" apiblueprint:sheerun/apiblueprint.vim
autocmd BufReadPost,BufNewFile *.apib set filetype=apiblueprint