diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-10-01 16:54:07 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-10-01 16:54:07 +0200 |
| commit | 0022675aa362da0969666e48ced252b57ca1f79e (patch) | |
| tree | fb5ff0f19151ce9bb46129a10e26dab85ca44bb8 | |
| parent | 5366e1aecfff4546df6af86cf98013f23ed5c3bd (diff) | |
| download | vim-git-8.2.1779.tar.gz | |
patch 8.2.1779: some debian changelog files are not recognizedv8.2.1779
Problem: Some debian changelog files are not recognized.
Solution: Add */debian/changelog. (Jason Franklin)
| -rw-r--r-- | runtime/filetype.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index ba1b79508..2b134c22b 100644 --- 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 8e41b1e43..d871b49c3 100644 --- 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 b92e99be5..39dcf2ef2 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1779, +/**/ 1778, /**/ 1777, |