diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-06-24 04:18:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-24 10:18:06 +0200 |
| commit | 352831229f78c6af514ceccedd2db48acffd117f (patch) | |
| tree | a0e03a6cb7f3af61cfc5b0e3c3060b321ca67fd7 | |
| parent | 30b02a1bee1a8cece089c7243548ef2cf5fb17bc (diff) | |
| download | rneovim-352831229f78c6af514ceccedd2db48acffd117f.tar.gz rneovim-352831229f78c6af514ceccedd2db48acffd117f.tar.bz2 rneovim-352831229f78c6af514ceccedd2db48acffd117f.zip | |
vim-patch:8.2.1044: not all systemd file types are recognized (#12527)
Problem: Not all systemd file types are recognized.
Solution: Match several more files. (Guido Cella, closes vim/vim#6319)
https://github.com/vim/vim/commit/ef6d86c173becdf82b7a9a1329342c9368340def
| -rw-r--r-- | runtime/filetype.vim | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 12a5ca729d..6f31eeb832 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1651,8 +1651,9 @@ au BufNewFile,BufRead *.sil setf sil au BufNewFile,BufRead */etc/sysctl.conf,*/etc/sysctl.d/*.conf setf sysctl " Systemd unit files -au BufNewFile,BufRead */systemd/*.{automount,mount,path,service,socket,swap,target,timer} setf systemd +au BufNewFile,BufRead */systemd/*.{automount,dnssd,link,mount,netdev,network,nspawn,path,service,slice,socket,swap,target,timer} setf systemd " Systemd overrides +au BufNewFile,BufRead */etc/systemd/*.conf.d/*.conf setf systemd au BufNewFile,BufRead */etc/systemd/system/*.d/*.conf setf systemd au BufNewFile,BufRead */.config/systemd/user/*.d/*.conf setf systemd " Systemd temp files diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 5d75d1aa57..9303fac927 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -439,7 +439,7 @@ let s:filename_checks = { \ 'swiftgyb': ['file.swift.gyb'], \ 'sil': ['file.sil'], \ 'sysctl': ['/etc/sysctl.conf', '/etc/sysctl.d/file.conf'], - \ 'systemd': ['any/systemd/file.automount', 'any/systemd/file.mount', 'any/systemd/file.path', 'any/systemd/file.service', 'any/systemd/file.socket', 'any/systemd/file.swap', 'any/systemd/file.target', 'any/systemd/file.timer', '/etc/systemd/system/some.d/file.conf', '/etc/systemd/system/some.d/.#file', '/etc/systemd/system/.#otherfile', '/home/user/.config/systemd/user/some.d/mine.conf', '/home/user/.config/systemd/user/some.d/.#file', '/home/user/.config/systemd/user/.#otherfile'], + \ 'systemd': ['any/systemd/file.automount', 'any/systemd/file.dnssd', 'any/systemd/file.link', 'any/systemd/file.mount', 'any/systemd/file.netdev', 'any/systemd/file.network', 'any/systemd/file.nspawn', 'any/systemd/file.path', 'any/systemd/file.service', 'any/systemd/file.slice', 'any/systemd/file.socket', 'any/systemd/file.swap', 'any/systemd/file.target', 'any/systemd/file.timer', '/etc/systemd/some.conf.d/file.conf', '/etc/systemd/system/some.d/file.conf', '/etc/systemd/system/some.d/.#file', '/etc/systemd/system/.#otherfile', '/home/user/.config/systemd/user/some.d/mine.conf', '/home/user/.config/systemd/user/some.d/.#file', '/home/user/.config/systemd/user/.#otherfile'], \ 'systemverilog': ['file.sv', 'file.svh'], \ 'tags': ['tags'], \ 'tak': ['file.tak'], |