summaryrefslogtreecommitdiff
path: root/runtime/filetype.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-06-09 19:44:55 +0200
committerBram Moolenaar <Bram@vim.org>2015-06-09 19:44:55 +0200
commitf2571c61d5aa05682ae4d358e625348b61adc861 (patch)
treeaae56b60e5a0fe20ea3c106539c63926380b4178 /runtime/filetype.vim
parentd0d0fe09cf95bf88f643ec07d07939cbd41f8e63 (diff)
downloadvim-git-f2571c61d5aa05682ae4d358e625348b61adc861.tar.gz
Updated runtime files.
Diffstat (limited to 'runtime/filetype.vim')
-rw-r--r--runtime/filetype.vim9
1 files changed, 4 insertions, 5 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 745503618..7529a60cc 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: 2015 Apr 06
+" Last Change: 2015 Jun 06
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -499,7 +499,7 @@ au BufNewFile,BufRead *.prg
\ endif
" Clojure
-au BufNewFile,BufRead *.clj,*.cljs setf clojure
+au BufNewFile,BufRead *.clj,*.cljs,*.cljx,*.cljc setf clojure
" Cmake
au BufNewFile,BufRead CMakeLists.txt,*.cmake,*.cmake.in setf cmake
@@ -776,10 +776,9 @@ au BufNewFile,BufRead *.mo,*.gdmo setf gdmo
au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom
" Git
-au BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit
-au BufNewFile,BufRead *.git/MERGE_MSG setf gitcommit
+au BufNewFile,BufRead COMMIT_EDITMSG setf gitcommit
+au BufNewFile,BufRead MERGE_MSG setf gitcommit
au BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig
-au BufNewFile,BufRead *.git/modules/*/COMMIT_EDITMSG setf gitcommit
au BufNewFile,BufRead *.git/modules/*/config setf gitconfig
au BufNewFile,BufRead */.config/git/config setf gitconfig
if !empty($XDG_CONFIG_HOME)