patch 8.2.3805: i3config files are not recognized

Problem:    i3config files are not recognized.
Solution:   Add patterns to match i3config files. (Quentin Hibon,
            closes #7969)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 2b98b48f55101c111739ed114859ed9a916e8ca3..71709129411f4e27d6ef94d5e48d151dcd387b8c 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -790,6 +790,10 @@ au BufNewFile,BufRead *.hb                 setf hb
 " Httest
 au BufNewFile,BufRead *.htt,*.htb              setf httest
 
+" i3 (and sway)
+au BufNewFile,BufRead */i3/config,*/sway/config                setf i3config
+au BufNewFile,BufRead */.i3/config,*/.sway/config      setf i3config
+
 " Icon
 au BufNewFile,BufRead *.icn                    setf icon
 

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 619cfec0c90a360419f239830741a69a48ac6dae..38941bab4471c4d883e620fb15f4cc21398cb33c 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -226,6 +226,7 @@ let s:filename_checks = {
     \ 'hollywood': ['file.hws'],
     \ 'hostconf': ['/etc/host.conf', 'any/etc/host.conf'],
     \ 'hostsaccess': ['/etc/hosts.allow', '/etc/hosts.deny', 'any/etc/hosts.allow', 'any/etc/hosts.deny'],
+    \ 'i3config': ['/home/user/.i3/config', '/home/user/.config/i3/config', '/etc/i3/config', '/etc/xdg/i3/config'],
     \ 'logcheck': ['/etc/logcheck/file.d-some/file', '/etc/logcheck/file.d/file', 'any/etc/logcheck/file.d-some/file', 'any/etc/logcheck/file.d/file'],
     \ 'modula3': ['file.m3', 'file.mg', 'file.i3', 'file.ig'],
     \ 'natural': ['file.NSA', 'file.NSC', 'file.NSG', 'file.NSL', 'file.NSM', 'file.NSN', 'file.NSP', 'file.NSS'],

diff --git a/src/version.c b/src/version.c
index df439e03c21edde7788f3f525973b345146db9c1..30a71e1ffe3e607872a7a67d906b56bf6a606a50 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3805,
 /**/
     3804,
 /**/