diff options
| author | James Eapen <james.eapen@vai.org> | 2022-07-27 15:07:06 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-07-27 15:07:06 +0100 |
| commit | 7abd1c6d8e777bde1700633bafc1a40be9e9c1aa (patch) | |
| tree | 72682425e7f4a0581665a095978c897d8be0e233 | |
| parent | 61021aa318ca4c4a6b0182ee93388b2e9b5eefba (diff) | |
| download | vim-git-9.0.0093.tar.gz | |
patch 9.0.0093: sway config files are recognized as i3configv9.0.0093
Problem: Sway config files are recognized as i3config.
Solution: Recognize swayconfig separately. (James Eapen, closes #10672)
| -rw-r--r-- | runtime/filetype.vim | 10 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index ae5260439..7ef613970 100644 --- 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 0104fdb8f..bfa4d5028 100644 --- 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 4d97dcdda..fde548bbb 100644 --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 93, +/**/ 92, /**/ 91, |