diff options
| author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-10-27 19:54:11 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-10-27 19:54:52 -0400 |
| commit | e101cdb3d7849761f331c19039b122bf4b77424d (patch) | |
| tree | 6896f71698e2a5b1c78b289b7be645a2a2bed59c | |
| parent | b9204123065f55f022796943bcb77099a00f5e24 (diff) | |
| download | rneovim-e101cdb3d7849761f331c19039b122bf4b77424d.tar.gz rneovim-e101cdb3d7849761f331c19039b122bf4b77424d.tar.bz2 rneovim-e101cdb3d7849761f331c19039b122bf4b77424d.zip | |
vim-patch:8.1.0498: /etc/gitconfig not recognized at a gitconfig file
Problem: /etc/gitconfig not recognized at a gitconfig file.
Solution: Add pattern to filetype detection. (closes vim/vim#3568)
https://github.com/vim/vim/commit/d474686a09ef3f7529e65abe00cf8cd2ea8a95eb
| -rw-r--r-- | runtime/filetype.vim | 10 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 4390fc878e..046dee95d6 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -601,12 +601,12 @@ au BufNewFile,BufRead *.mo,*.gdmo setf gdmo au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom " Git -au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit -au BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig -au BufNewFile,BufRead *.git/modules/*/config setf gitconfig -au BufNewFile,BufRead */.config/git/config setf gitconfig +au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit +au BufNewFile,BufRead *.git/config,.gitconfig,/etc/gitconfig setf gitconfig +au BufNewFile,BufRead */.config/git/config setf gitconfig +au BufNewFile,BufRead .gitmodules,*.git/modules/*/config setf gitconfig if !empty($XDG_CONFIG_HOME) - au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config setf gitconfig + au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config setf gitconfig endif au BufNewFile,BufRead git-rebase-todo setf gitrebase au BufRead,BufNewFile .gitsendemail.msg.?????? setf gitsendemail diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 5bb8bcd10d..4403d89121 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -171,7 +171,7 @@ let s:filename_checks = { \ 'gdmo': ['file.mo', 'file.gdmo'], \ 'gedcom': ['file.ged', 'lltxxxxx.txt'], \ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG'], - \ 'gitconfig': ['file.git/config', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config'], + \ 'gitconfig': ['file.git/config', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig'], \ 'gitolite': ['gitolite.conf'], \ 'gitrebase': ['git-rebase-todo'], \ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'], |