Skip to content

Commit ef6d86c

Browse files
committed
patch 8.2.1044: not all systemd file types are recognized
Problem: Not all systemd file types are recognized. Solution: Match several more files. (Guido Cella, closes #6319)
1 parent 4014e2c commit ef6d86c

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

runtime/filetype.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1655,8 +1655,9 @@ au BufNewFile,BufRead *.sil setf sil
16551655
au BufNewFile,BufRead */etc/sysctl.conf,*/etc/sysctl.d/*.conf setf sysctl
16561656

16571657
" Systemd unit files
1658-
au BufNewFile,BufRead */systemd/*.{automount,mount,path,service,socket,swap,target,timer} setf systemd
1658+
au BufNewFile,BufRead */systemd/*.{automount,dnssd,link,mount,netdev,network,nspawn,path,service,slice,socket,swap,target,timer} setf systemd
16591659
" Systemd overrides
1660+
au BufNewFile,BufRead */etc/systemd/*.conf.d/*.conf setf systemd
16601661
au BufNewFile,BufRead */etc/systemd/system/*.d/*.conf setf systemd
16611662
au BufNewFile,BufRead */.config/systemd/user/*.d/*.conf setf systemd
16621663
" Systemd temp files

src/testdir/test_filetype.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ let s:filename_checks = {
440440
\ 'swiftgyb': ['file.swift.gyb'],
441441
\ 'sil': ['file.sil'],
442442
\ 'sysctl': ['/etc/sysctl.conf', '/etc/sysctl.d/file.conf'],
443-
\ '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'],
443+
\ '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'],
444444
\ 'systemverilog': ['file.sv', 'file.svh'],
445445
\ 'tags': ['tags'],
446446
\ 'tak': ['file.tak'],

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,8 @@ static char *(features[]) =
754754

755755
static int included_patches[] =
756756
{ /* Add new patch number below this line */
757+
/**/
758+
1044,
757759
/**/
758760
1043,
759761
/**/

0 commit comments

Comments
 (0)