patch 8.2.0549: user systemd files not recognized

Problem:    User systemd files not recognized.
Solution:   Add filetype patterns. (Kevin Locke, closes #5914)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 4f2fd2552949d2d8a71cfa2bdffdb107151a0ca8..0898a185bad647b00a4cbdd7f784b367e4e7ac26 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last Change: 2020 Mar 19
+" Last Change: 2020 Apr 12
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -1646,9 +1646,11 @@ 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
 " Systemd overrides
-au BufNewFile,BufRead /etc/systemd/system/*.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
-au BufNewFile,BufRead /etc/systemd/system/*.d/.#*      setf systemd
+au BufNewFile,BufRead */etc/systemd/system/*.d/.#*     setf systemd
+au BufNewFile,BufRead */.config/systemd/user/*.d/.#*   setf systemd
 
 " Synopsys Design Constraints
 au BufNewFile,BufRead *.sdc                    setf sdc

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 3cfe6d4e26d7ef31e47b1158115c950893be82bd..a160a98a90e6b741d8fac51e97a9fd55656ac5ca 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -438,7 +438,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'],
+    \ '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', '/home/user/.config/systemd/user/some.d/mine.conf', '/home/user/.config/systemd/user/some.d/.#file'],
     \ 'systemverilog': ['file.sv', 'file.svh'],
     \ 'tags': ['tags'],
     \ 'tak': ['file.tak'],

diff --git a/src/version.c b/src/version.c
index d7d504b3b2c1aa4e1f8eb733904fc2a4ac318861..ea8f84d8de84d0ead6881f22696dab95d74c6b2f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    549,
 /**/
     548,
 /**/