aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-10-01 21:46:16 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-10-02 22:31:55 -0400
commit72914cd7f21570a725fdace9c9fe2b171ec4c107 (patch)
tree02e1dabfe01889c948e75f34bf19b48fc6de3fb7
parentc10c2fab5b4509a7ff50526b56c669f30ebf87c9 (diff)
downloadrneovim-72914cd7f21570a725fdace9c9fe2b171ec4c107.tar.gz
rneovim-72914cd7f21570a725fdace9c9fe2b171ec4c107.tar.bz2
rneovim-72914cd7f21570a725fdace9c9fe2b171ec4c107.zip
vim-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) https://github.com/vim/vim/commit/0022675aa362da0969666e48ced252b57ca1f79e
-rw-r--r--runtime/filetype.vim2
-rw-r--r--src/nvim/testdir/test_filetype.vim1
2 files changed, 2 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c464e8cebd..7accc22b3d 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -313,7 +313,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/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index 9f8939f2f6..c7ca682c8c 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/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'],