aboutsummaryrefslogtreecommitdiff
path: root/runtime/lua
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2022-07-27 18:11:59 +0200
committerGitHub <noreply@github.com>2022-07-27 18:11:59 +0200
commit4c3104819baa5c0667ce3a41f3b03bdd4b40cb30 (patch)
treef6ec02b9dc881cfc478e0ba730139d85eeb0d25d /runtime/lua
parent9b447c7ce5bd81d576bcc9253ed77416d9baf59b (diff)
downloadrneovim-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
Diffstat (limited to 'runtime/lua')
-rw-r--r--runtime/lua/vim/filetype.lua8
1 files changed, 2 insertions, 6 deletions
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)