Mercurial > vim

changeset 20804:ad15725594f8 v8.2.0954

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0954: not all desktop files are recognized Commit: https://github.com/vim/vim/commit/f1f0ff9557353c9a452aac8540411a88cf2da47c Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jun 10 22:07:52 2020 +0200 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 https://github.com/vim/vim/issues/3317)
author Bram Moolenaar <Bram@vim.org>
date Wed, 10 Jun 2020 22:15:03 +0200
parents 0e5a27f1631c
children c18241b2966b
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -462,7 +462,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
--- a/src/testdir/test_filetype.vim
+++ b/src/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'],
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    954,
+/**/
     953,
 /**/
     952,