summaryrefslogtreecommitdiffstats
path: root/ftdetect
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2016-07-05 09:53:49 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2016-07-05 09:53:49 +0200
commitbf188c4a51a6d151bb2694d73048727f4359c634 (patch)
tree3059e2f946ae6293e1809d67393fddced1197431 /ftdetect
parenta5857b81c215139b3c0def78e5bd2f1da8a17af6 (diff)
downloadvim-polyglot-2.11.1.tar.gz
vim-polyglot-2.11.1.zip
Updatev2.11.1
Diffstat (limited to 'ftdetect')
-rw-r--r--ftdetect/polyglot.vim12
1 files changed, 11 insertions, 1 deletions
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index b380b925..1bca15c6 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -99,12 +99,22 @@ au BufNewFile,BufRead *.elm set filetype=elm
endif
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
+if !exists('g:vim_ember_script')
+ let g:vim_ember_script = 1
+endif
autocmd BufNewFile,BufRead *.em set filetype=ember-script
autocmd FileType ember-script set tabstop=2|set shiftwidth=2|set expandtab
endif
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
-autocmd BufNewFile,BufRead *.emblem set filetype=emblem
+if !exists('g:vim_emblem')
+ let g:vim_emblem = 1
+endif
+if exists('g:vim_ember_script')
+ autocmd BufNewFile,BufRead *.emblem set filetype=emblem
+else
+ autocmd BufNewFile,BufRead *.em,*.emblem set filetype=emblem
+endif
autocmd FileType emblem set tabstop=2|set shiftwidth=2|set expandtab
endif
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1