diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-10-27 14:27:20 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-10-27 14:27:20 +0200 |
| commit | d474686a09ef3f7529e65abe00cf8cd2ea8a95eb (patch) | |
| tree | 3157c6e5e94d83ea17f0043c2e649eb59a7c5325 | |
| parent | 5f57bdcab77bc417ae0357fe8ad6c7259b6d25df (diff) | |
| download | vim-git-d474686a09ef3f7529e65abe00cf8cd2ea8a95eb.tar.gz | |
patch 8.1.0498: /etc/gitconfig not recognized at a gitconfig filev8.1.0498
Problem: /etc/gitconfig not recognized at a gitconfig file.
Solution: Add pattern to filetype detection. (closes #3568)
| -rw-r--r-- | runtime/filetype.vim | 10 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 218b01fb6..af27c85d8 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -613,12 +613,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/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 3240f1f1d..9c537646f 100644 --- 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'], diff --git a/src/version.c b/src/version.c index c3f2e2391..c867ecf39 100644 --- a/src/version.c +++ b/src/version.c @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 498, +/**/ 497, /**/ 496, |