Patch 8.2.0954

[Bram Moolenaar]

Patch 8.2.0954
Problem: Not all desktop files are recognized.
Solution: Add the *.directory pattern. (Eisuke Kawashima, closes #3317)
Files: runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-8.2.0953/runtime/filetype.vim 2020-06-07 20:07:40.133852226 +0200
--- runtime/filetype.vim 2020-06-10 22:05:27.895979668 +0200
***************
*** 462,468 ****
au BufNewFile,BufRead *.d call dist#ft#DtraceCheck()

" Desktop files
! au BufNewFile,BufRead *.desktop,.directory setf desktop

" Dict config
au BufNewFile,BufRead dict.conf,.dictrc setf dictconf
--- 462,468 ----
au BufNewFile,BufRead *.d call dist#ft#DtraceCheck()

" Desktop files
! au BufNewFile,BufRead *.desktop,*.directory setf desktop

" Dict config
au BufNewFile,BufRead dict.conf,.dictrc setf dictconf
*** ../vim-8.2.0953/src/testdir/test_filetype.vim 2020-06-07 21:58:09.872657559 +0200
--- src/testdir/test_filetype.vim 2020-06-10 22:07:15.771657558 +0200
***************
*** 131,137 ****
\ 'def': ['file.def'],
\ 'denyhosts': ['denyhosts.conf'],
\ 'desc': ['file.desc'],
! \ 'desktop': ['file.desktop', '.directory'],
\ 'dictconf': ['dict.conf', '.dictrc'],
\ 'dictdconf': ['dictd.conf'],
\ 'diff': ['file.diff', 'file.rej'],
--- 131,137 ----
\ 'def': ['file.def'],
\ 'denyhosts': ['denyhosts.conf'],
\ 'desc': ['file.desc'],
! \ 'desktop': ['file.desktop', '.directory', 'file.directory'],
\ 'dictconf': ['dict.conf', '.dictrc'],
\ 'dictdconf': ['dictd.conf'],
\ 'diff': ['file.diff', 'file.rej'],
*** ../vim-8.2.0953/src/version.c 2020-06-10 21:46:56.391670009 +0200
--- src/version.c 2020-06-10 22:06:40.271764202 +0200
***************
*** 756,757 ****
--- 756,759 ----
{ /* Add new patch number below this line */
+ /**/
+ 954,
/**/

--
GUARD #1: What -- a swallow carrying a coconut?
ARTHUR: It could grip it by the husk!
GUARD #1: It's not a question of where he grips it! It's a simple question
of weight ratios! A five ounce bird could not carry a 1 pound
coconut.
The Quest for the Holy Grail (Monty Python)

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///