From fa13eef3c9edc81c07a47124c2c893a4bb253e58 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 6 Feb 2013 17:34:04 +0100 Subject: Updated runtime files. --- runtime/filetype.vim | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'runtime/filetype.vim') diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 221c0cafc..08270f170 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar -" Last Change: 2012 Nov 28 +" Last Change: 2013 Jan 31 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -489,6 +489,9 @@ au BufNewFile,BufRead *.prg \ setf clipper | \ endif +" Clojure +au BufNewFile,BufRead *.clj,*.cljs setf clojure + " Cmake au BufNewFile,BufRead CMakeLists.txt,*.cmake,*.cmake.in setf cmake @@ -744,6 +747,7 @@ 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 *.git/config,.gitconfig,.gitmodules setf gitconfig au BufNewFile,BufRead *.git/modules/**/COMMIT_EDITMSG setf gitcommit au BufNewFile,BufRead *.git/modules/**/config setf gitconfig -- cgit v1.2.1