summaryrefslogtreecommitdiffstats
path: root/ftdetect
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2013-12-13 01:37:01 +0100
committerAdam Stankiewicz <sheerun@sher.pl>2013-12-13 01:37:01 +0100
commitedd5ee63e66d9ef166034d9ac5bed132f501ecb9 (patch)
treefba293d90821eea5e067c7b5eea3526df0f26254 /ftdetect
parent8a255002df1f6d02ef7ca9503be1a7d7234acef8 (diff)
downloadvim-polyglot-1.4.2.tar.gz
vim-polyglot-1.4.2.zip
Updatev1.4.2
Diffstat (limited to 'ftdetect')
-rw-r--r--ftdetect/polyglot.vim1
1 files changed, 0 insertions, 1 deletions
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 457fd19a..bcccd785 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -56,7 +56,6 @@ endif
autocmd BufNewFile,BufReadPost *.jade set filetype=jade
au BufNewFile,BufRead *.js setf javascript
au BufNewFile,BufRead *.jsm setf javascript
-au BufNewFile,BufRead *.json setf javascript
au BufNewFile,BufRead Jakefile setf javascript
fun! s:SelectJavascript()
if getline(1) =~# '^#!.*/bin/env\s\+node\>'