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)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 12ccd45c0c8759333a7b2b3bc10b733158b79d41..c585515b0e4caa8b089b108e99a114d3c6465525 100644 (file)
--- 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

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 244de242ce3d77e37c2567e3794a4c66fd7cef49..dca25125be781ee25d4553b5e3ff05fd9cd0f327 100644 (file)
--- 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'],

diff --git a/src/version.c b/src/version.c
index b30e5570cbd6acdfe38be59ab3dedfa40aa18479..63177cff43fb266840a3f9f4998e59132d6c3329 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    954,
 /**/
     953,
 /**/