diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2022-07-27 18:11:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 18:11:59 +0200 |
| commit | 4c3104819baa5c0667ce3a41f3b03bdd4b40cb30 (patch) | |
| tree | f6ec02b9dc881cfc478e0ba730139d85eeb0d25d | |
| parent | 9b447c7ce5bd81d576bcc9253ed77416d9baf59b (diff) | |
| download | rneovim-4c3104819baa5c0667ce3a41f3b03bdd4b40cb30.tar.gz rneovim-4c3104819baa5c0667ce3a41f3b03bdd4b40cb30.tar.bz2 rneovim-4c3104819baa5c0667ce3a41f3b03bdd4b40cb30.zip | |
vim-patch:9.0.0093: sway config files are recognized as i3config (#19545)
Problem: Sway config files are recognized as i3config.
Solution: Recognize swayconfig separately. (James Eapen, closes vim/vim#10672)
https://github.com/vim/vim/commit/7abd1c6d8e777bde1700633bafc1a40be9e9c1aa
| -rw-r--r-- | runtime/filetype.vim | 10 | ||||
| -rw-r--r-- | runtime/lua/vim/filetype.lua | 8 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 1 |
3 files changed, 10 insertions, 9 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 5a5937a209..fbb4b9f6aa 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -860,9 +860,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/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index 10eff6598c..9c59442caf 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -1384,10 +1384,6 @@ local filename = { ['/etc/host.conf'] = 'hostconf', ['/etc/hosts.allow'] = 'hostsaccess', ['/etc/hosts.deny'] = 'hostsaccess', - ['/i3/config'] = 'i3config', - ['/sway/config'] = 'i3config', - ['/.sway/config'] = 'i3config', - ['/.i3/config'] = 'i3config', ['/.icewm/menu'] = 'icemenu', ['.indent.pro'] = 'indent', indentrc = 'indent', @@ -1835,9 +1831,7 @@ local pattern = { ['.*/etc/hosts%.allow'] = 'hostsaccess', ['.*%.html%.m4'] = 'htmlm4', ['.*/%.i3/config'] = 'i3config', - ['.*/sway/config'] = 'i3config', ['.*/i3/config'] = 'i3config', - ['.*/%.sway/config'] = 'i3config', ['.*/%.icewm/menu'] = 'icemenu', ['.*/etc/initng/.*/.*%.i'] = 'initng', ['JAM.*%..*'] = starsetf('jam'), @@ -2076,6 +2070,8 @@ local pattern = { end, ['.*/etc/sudoers'] = 'sudoers', ['svn%-commit.*%.tmp'] = 'svn', + ['.*/sway/config'] = 'swayconfig', + ['.*/%.sway/config'] = 'swayconfig', ['.*%.swift%.gyb'] = 'swiftgyb', ['.*%.[Ss][Yy][Ss]'] = function(path, bufnr) return require('vim.filetype.detect').sys(bufnr) diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 856235acef..eedad15e9e 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -534,6 +534,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'], |