patch 8.2.1779: some debian changelog files are not recognized

Problem:    Some debian changelog files are not recognized.
Solution:   Add */debian/changelog. (Jason Franklin)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ba1b79508c4beb8bd312a07cdbe7a5fb2e81bc4c..2b134c22b6955a47119d6b5b989cc95bafe2dadd 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -317,7 +317,7 @@ au BufNewFile,BufRead *.css                 setf css
 au BufNewFile,BufRead *.con                    setf cterm
 
 " Changelog
-au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch
+au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch,*/debian/changelog
                                        \       setf debchangelog
 
 au BufNewFile,BufRead [cC]hange[lL]og

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 8e41b1e43b218dee122466fd8661df443b299fba..d871b49c3b32e0d77b3592e5c2b323c01a7a5bae 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -128,6 +128,7 @@ let s:filename_checks = {
     \ 'dart': ['file.dart', 'file.drt'],
     \ 'datascript': ['file.ds'],
     \ 'dcd': ['file.dcd'],
+    \ 'debchangelog': ['changelog.Debian', 'changelog.dch', 'NEWS.Debian', 'NEWS.dch', '/debian/changelog'],
     \ 'debcontrol': ['/debian/control'],
     \ 'debsources': ['/etc/apt/sources.list', '/etc/apt/sources.list.d/file.list'],
     \ 'def': ['file.def'],

diff --git a/src/version.c b/src/version.c
index b92e99be54d161beb954a7951687591b976d9e73..39dcf2ef21a038f600109a0c36c10f9fa844134f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1779,
 /**/
     1778,
 /**/