diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-06-10 22:39:57 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-06-18 18:01:43 -0400 |
| commit | abadb687fb76b9ef34c5df7f6da88fdf0a20577b (patch) | |
| tree | 930344746bc2da6471b3479124ae8ba36037688b | |
| parent | 44535d39e9fc13cc069d8dc3a6ca10af22d3c380 (diff) | |
| download | rneovim-abadb687fb76b9ef34c5df7f6da88fdf0a20577b.tar.gz rneovim-abadb687fb76b9ef34c5df7f6da88fdf0a20577b.tar.bz2 rneovim-abadb687fb76b9ef34c5df7f6da88fdf0a20577b.zip | |
vim-patch:8.2.0954: not all desktop files are recognized
Problem: Not all desktop files are recognized.
Solution: Add the *.directory pattern. (Eisuke Kawashima, closes vim/vim#3317)
https://github.com/vim/vim/commit/f1f0ff9557353c9a452aac8540411a88cf2da47c
| -rw-r--r-- | runtime/filetype.vim | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 141008a5ab..2ba80a7d3b 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -458,7 +458,7 @@ au BufNewFile,BufRead *.desc setf desc au BufNewFile,BufRead *.d call dist#ft#DtraceCheck() " Desktop files -au BufNewFile,BufRead *.desktop,.directory setf desktop +au BufNewFile,BufRead *.desktop,*.directory setf desktop " Dict config au BufNewFile,BufRead dict.conf,.dictrc setf dictconf diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 3867434b3a..3feb65e08a 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -131,7 +131,7 @@ let s:filename_checks = { \ 'def': ['file.def'], \ 'denyhosts': ['denyhosts.conf'], \ 'desc': ['file.desc'], - \ 'desktop': ['file.desktop', '.directory'], + \ 'desktop': ['file.desktop', '.directory', 'file.directory'], \ 'dictconf': ['dict.conf', '.dictrc'], \ 'dictdconf': ['dictd.conf'], \ 'diff': ['file.diff', 'file.rej'], |