aboutsummaryrefslogtreecommitdiff
path: root/runtime/filetype.vim
diff options
context:
space:
mode:
authorFlorian Walch <florian@fwalch.com>2015-05-18 18:30:10 +0300
committerFlorian Walch <florian@fwalch.com>2015-05-19 12:44:56 +0300
commit90fae3663f543e9573c4e69380cfcdcbc7bb34fc (patch)
tree5d4afe1d52a3ce18c0f8a9ffbfc5dc0891f2246b /runtime/filetype.vim
parent73137e0a84d73196db1a8d66a45210f7ffb6632d (diff)
downloadrneovim-90fae3663f543e9573c4e69380cfcdcbc7bb34fc.tar.gz
rneovim-90fae3663f543e9573c4e69380cfcdcbc7bb34fc.tar.bz2
rneovim-90fae3663f543e9573c4e69380cfcdcbc7bb34fc.zip
vim-patch:4abac79 #2694
Update runtime files. https://code.google.com/p/vim/source/detail?r=4abac79c0b7ae7aac0cb32d9930e155de628b63f
Diffstat (limited to 'runtime/filetype.vim')
-rw-r--r--runtime/filetype.vim5
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 127cf86349..d7bac1bdcf 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: 2014 Oct 09
+" Last Change: 2014 Nov 05
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -778,6 +778,9 @@ 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)
+ au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config setf gitconfig
+endif
au BufNewFile,BufRead git-rebase-todo setf gitrebase
au BufNewFile,BufRead .msg.[0-9]*
\ if getline(1) =~ '^From.*# This line is ignored.$' |