Mercurial > vim
changeset 14974:f8e6b4f82086 v8.1.0498
patch 8.1.0498: /etc/gitconfig not recognized at a gitconfig file
commit https://github.com/vim/vim/commit/d474686a09ef3f7529e65abe00cf8cd2ea8a95eb
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Oct 27 14:27:20 2018 +0200
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 https://github.com/vim/vim/issues/3568)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 27 Oct 2018 14:30:06 +0200 |
parents | d3c4e963f0ff |
children | 0b92912925c7 |
files | runtime/filetype.vim src/testdir/test_filetype.vim src/version.c |
diffstat | 3 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -613,12 +613,12 @@ au BufNewFile,BufRead *.mo,*.gdmo setf 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
--- a/src/testdir/test_filetype.vim +++ b/src/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'],