Patch 8.2.0549

5 views
Skip to first unread message

Bram Moolenaar

unread,
Apr 12, 2020, 6:55:32 AM4/12/20
to vim...@googlegroups.com

Patch 8.2.0549
Problem: User systemd files not recognized.
Solution: Add filetype patterns. (Kevin Locke, closes #5914)
Files: runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-8.2.0548/runtime/filetype.vim 2020-03-19 20:31:57.369449811 +0100
--- runtime/filetype.vim 2020-04-12 12:53:12.919967383 +0200
***************
*** 1,7 ****
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Br...@vim.org>
! " Last Change: 2019 Nov 26

" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
--- 1,7 ----
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Br...@vim.org>
! " Last Change: 2020 Apr 12

" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
***************
*** 1646,1654 ****
" 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
" Systemd temp files
! au BufNewFile,BufRead /etc/systemd/system/*.d/.#* setf systemd

" Synopsys Design Constraints
au BufNewFile,BufRead *.sdc setf sdc
--- 1646,1656 ----
" 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 */.config/systemd/user/*.d/*.conf setf systemd
" Systemd temp files
! 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
*** ../vim-8.2.0548/src/testdir/test_filetype.vim 2020-03-19 20:31:57.369449811 +0100
--- src/testdir/test_filetype.vim 2020-04-12 12:52:41.448056207 +0200
***************
*** 438,444 ****
\ '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'],
\ 'systemverilog': ['file.sv', 'file.svh'],
\ 'tags': ['tags'],
\ 'tak': ['file.tak'],
--- 438,444 ----
\ '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', '/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'],
*** ../vim-8.2.0548/src/version.c 2020-04-11 23:17:13.907173700 +0200
--- src/version.c 2020-04-12 12:54:06.043817201 +0200
***************
*** 740,741 ****
--- 740,743 ----
{ /* Add new patch number below this line */
+ /**/
+ 549,
/**/

--
An SQL statement walks into a bar. He approaches two tables
and says, "Mind if I join you?"

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages