Skip to content

Commit f1f0ff9

Browse files
committed
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 #3317)
1 parent 362b44b commit f1f0ff9

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

runtime/filetype.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ au BufNewFile,BufRead *.desc setf desc
462462
au BufNewFile,BufRead *.d call dist#ft#DtraceCheck()
463463

464464
" Desktop files
465-
au BufNewFile,BufRead *.desktop,.directory setf desktop
465+
au BufNewFile,BufRead *.desktop,*.directory setf desktop
466466

467467
" Dict config
468468
au BufNewFile,BufRead dict.conf,.dictrc setf dictconf

src/testdir/test_filetype.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ let s:filename_checks = {
131131
\ 'def': ['file.def'],
132132
\ 'denyhosts': ['denyhosts.conf'],
133133
\ 'desc': ['file.desc'],
134-
\ 'desktop': ['file.desktop', '.directory'],
134+
\ 'desktop': ['file.desktop', '.directory', 'file.directory'],
135135
\ 'dictconf': ['dict.conf', '.dictrc'],
136136
\ 'dictdconf': ['dictd.conf'],
137137
\ 'diff': ['file.diff', 'file.rej'],

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,8 @@ static char *(features[]) =
754754

755755
static int included_patches[] =
756756
{ /* Add new patch number below this line */
757+
/**/
758+
954,
757759
/**/
758760
953,
759761
/**/

0 commit comments

Comments
 (0)