patch 9.0.0093: sway config files are recognized as i3config

Problem:    Sway config files are recognized as i3config.
Solution:   Recognize swayconfig separately. (James Eapen, closes #10672)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ae52604392b4331b288d9232b7e12fa7b183c030..7ef613970876aa7d979264482448de820f1c5766 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -859,9 +859,13 @@ 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
+" i3
+au BufNewFile,BufRead */i3/config              setf i3config
+au BufNewFile,BufRead */.i3/config     setf i3config
+
+" sway
+au BufNewFile,BufRead */sway/config            setf swayconfig
+au BufNewFile,BufRead */.sway/config   setf swayconfig
 
 " Icon
 au BufNewFile,BufRead *.icn                    setf icon

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 0104fdb8f4d2085335a4fc73bacb16394769752b..bfa4d5028055c7d0035ba792cf4f630657730863 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -535,6 +535,7 @@ let s:filename_checks = {
     \ 'svelte': ['file.svelte'],
     \ 'svg': ['file.svg'],
     \ 'svn': ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'],
+    \ 'swayconfig': ['/home/user/.sway/config', '/home/user/.config/sway/config', '/etc/sway/config', '/etc/xdg/sway/config'],
     \ 'swift': ['file.swift'],
     \ 'swiftgyb': ['file.swift.gyb'],
     \ 'sysctl': ['/etc/sysctl.conf', '/etc/sysctl.d/file.conf', 'any/etc/sysctl.conf', 'any/etc/sysctl.d/file.conf'],

diff --git a/src/version.c b/src/version.c
index 4d97dcddaab41bd17cfa976ee528fa8659295a72..fde548bbb3f619221e267aaa35a1dc8867f074a6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    93,
 /**/
     92,
 /**/