diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-08-17 18:30:01 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-08-17 18:30:10 -0400 |
| commit | 97d3bd0bc675537ea2afa5ad5b1f5bae6cc2fc53 (patch) | |
| tree | 9f8b8607b79a54670fa12e837dc4dd3924dd59a6 | |
| parent | e99d1a7fbbb663bfacf583c939d4718e4a7d5107 (diff) | |
| download | rneovim-97d3bd0bc675537ea2afa5ad5b1f5bae6cc2fc53.tar.gz rneovim-97d3bd0bc675537ea2afa5ad5b1f5bae6cc2fc53.tar.bz2 rneovim-97d3bd0bc675537ea2afa5ad5b1f5bae6cc2fc53.zip | |
vim-patch:8.2.1474: /usr/lib/udef/rules.d not recognized as udevrules
Problem: /usr/lib/udef/rules.d not recognized as udevrules.
Solution: Adjust match pattern. (Haochen Tong, closes 36722)
https://github.com/vim/vim/commit/624b6eaf20f3e8c669425b6a32f17fb9ec2ebbd2
| -rw-r--r-- | runtime/autoload/dist/ft.vim | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim index e85ffc763b..a2d87a483a 100644 --- a/runtime/autoload/dist/ft.vim +++ b/runtime/autoload/dist/ft.vim @@ -575,7 +575,7 @@ endfunc let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*' func dist#ft#FTRules() let path = expand('<amatch>:p') - if path =~ '^/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|lib/udev/\%(rules\.d/\)\=.*\.rules\)$' + if path =~ '^/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|\%(usr/\)\=lib/udev/\%(rules\.d/\)\=.*\.rules\)$' setf udevrules return endif diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 8cf7400f7a..529f237a97 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -471,6 +471,7 @@ let s:filename_checks = { \ 'uc': ['file.uc'], \ 'udevconf': ['/etc/udev/udev.conf'], \ 'udevperm': ['/etc/udev/permissions.d/file.permissions'], + \ 'udevrules': ['/etc/udev/rules.d/file.rules', '/usr/lib/udev/rules.d/file.rules', '/lib/udev/rules.d/file.rules'], \ 'uil': ['file.uit', 'file.uil'], \ 'updatedb': ['/etc/updatedb.conf'], \ 'upstart': ['/usr/share/upstart/file.conf', '/usr/share/upstart/file.override', '/etc/init/file.conf', '/etc/init/file.override', '/.init/file.conf', '/.init/file.override', '/.config/upstart/file.conf', '/.config/upstart/file.override'], |