summaryrefslogtreecommitdiffstats
path: root/runtime/filetype.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-09-14 17:55:08 +0200
committerBram Moolenaar <Bram@vim.org>2011-09-14 17:55:08 +0200
commit5302d9ebc1be723a25ff3dc62388305f6862749d (patch)
treedcd450a19d82d9eda33ba5fb9e1becd85f87a469 /runtime/filetype.vim
parentddab33232a81e713c2748fc3daab763f07dd76f1 (diff)
Updated runtime files.
Diffstat (limited to 'runtime/filetype.vim')
-rw-r--r--runtime/filetype.vim10
1 files changed, 8 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index e4c0d1af5c..5857c529ae 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2011 Jul 17
+" Last Change: 2011 Sep 07
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -922,7 +922,7 @@ au BufNewFile,BufRead *.java,*.jav setf java
au BufNewFile,BufRead *.jj,*.jjt setf javacc
" JavaScript, ECMAScript
-au BufNewFile,BufRead *.js,*.javascript,*.es,*.jsx setf javascript
+au BufNewFile,BufRead *.js,*.javascript,*.es,*.jsx,*.json setf javascript
" Java Server Pages
au BufNewFile,BufRead *.jsp setf jsp
@@ -2345,6 +2345,9 @@ endfunc
" Yaml
au BufNewFile,BufRead *.yaml,*.yml setf yaml
+" yum conf (close enough to dosini)
+au BufNewFile,BufRead */etc/yum.conf setf dosini
+
" Zope
" dtml (zope dynamic template markup language), pt (zope page template),
" cpt (zope form controller page template)
@@ -2515,6 +2518,9 @@ au BufNewFile,BufRead *xmodmap* call s:StarSetf('xmodmap')
" Xinetd conf
au BufNewFile,BufRead */etc/xinetd.d/* call s:StarSetf('xinetd')
+" yum conf (close enough to dosini)
+au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
+
" Z-Shell script
au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh')