summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Hibon <qh.public@yahoo.com>2021-12-14 09:34:41 +0000
committerBram Moolenaar <Bram@vim.org>2021-12-14 09:34:41 +0000
commit8176be159859deb9cf6455565bd7b24b3dcf17b9 (patch)
tree3d1b8cca66bef1a0a6548e09d4f5d41027d79fec
parent6206877c511c636cbeb2a2b911451af316b62d00 (diff)
downloadvim-git-8176be159859deb9cf6455565bd7b24b3dcf17b9.tar.gz
patch 8.2.3805: i3config files are not recognizedv8.2.3805
Problem: i3config files are not recognized. Solution: Add patterns to match i3config files. (Quentin Hibon, closes #7969)
-rw-r--r--runtime/filetype.vim4
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 7 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 2b98b48f5..717091294 100644
--- 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 619cfec0c..38941bab4 100644
--- 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 df439e03c..30a71e1ff 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3805,
+/**/
3804,
/**/
3803,