summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorObserverOfTime <chronobserver@disroot.org>2023-01-28 18:05:40 +0000
committerBram Moolenaar <Bram@vim.org>2023-01-28 18:05:40 +0000
commit04e4f1d98556e67d7337224b67b71c828410ee0f (patch)
treef3928ab07cab72346f3c354c23ee8a61623b11a3
parent8fe5b9c8c1223861cec0484ccc031858ae08d107 (diff)
patch 9.0.1256: NetworkManager connection files are not recognizedv9.0.1256
Problem: NetworkManager connection files are not recognized. Solution: Add a pattern for NetworkManager connection files. (closes #11893)
-rw-r--r--runtime/filetype.vim1
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 0ce1046433..9f22140943 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1399,6 +1399,7 @@ au BufNewFile,BufRead pf.conf setf pf
" ini style config files, using # comments
au BufNewFile,BufRead */etc/pacman.conf,mpv.conf setf confini
au BufNewFile,BufRead */.aws/config,*/.aws/credentials setf confini
+au BufNewFile,BufRead *.nmconnection setf confini
" Pacman hooks
au BufNewFile,BufRead *.hook
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 787d729cf4..3eef5a09d2 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -121,7 +121,7 @@ let s:filename_checks = {
\ 'conaryrecipe': ['file.recipe'],
\ 'conf': ['auto.master'],
\ 'config': ['configure.in', 'configure.ac', '/etc/hostname.file', 'any/etc/hostname.file'],
- \ 'confini': ['/etc/pacman.conf', 'any/etc/pacman.conf', 'mpv.conf', 'any/.aws/config', 'any/.aws/credentials'],
+ \ 'confini': ['/etc/pacman.conf', 'any/etc/pacman.conf', 'mpv.conf', 'any/.aws/config', 'any/.aws/credentials', 'file.nmconnection'],
\ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi', 'file.mkxl', 'file.mklx'],
\ 'cook': ['file.cook'],
\ 'cpp': ['file.cxx', 'file.c++', 'file.hh', 'file.hxx', 'file.hpp', 'file.ipp', 'file.moc', 'file.tcc', 'file.inl', 'file.tlh'],
diff --git a/src/version.c b/src/version.c
index b99641f5ba..eb317fb651 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1256,
+/**/
1255,
/**/
1254,