aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2023-10-23 19:24:52 +0200
committerChristian Clason <c.clason@uni-graz.at>2023-10-24 10:15:47 +0200
commit94fee354465d7d8636f454a9bcca9080ef9e50bd (patch)
tree83b926ab6f904461fd064d17ffb29f13b34b8c38
parent5f0224e848740eaf8fa68fe9cd89b060b31616fc (diff)
downloadrneovim-94fee354465d7d8636f454a9bcca9080ef9e50bd.tar.gz
rneovim-94fee354465d7d8636f454a9bcca9080ef9e50bd.tar.bz2
rneovim-94fee354465d7d8636f454a9bcca9080ef9e50bd.zip
vim-patch:9.0.2061: not able to detect xkb filetypes
Problem: not able to detect xkb filetypes Solution: Detect files below /u/s/X11/xkb as xkb files (without adding an extra filetype) Those files are used from the X11 xkb extension closes: vim/vim#13401 https://github.com/vim/vim/commit/ae9021a840db3253b0e0cb84186faae73368afd7 Co-authored-by: Guido Cella <guido@guidocella.xyz>
-rw-r--r--runtime/lua/vim/filetype.lua5
-rw-r--r--test/old/testdir/test_filetype.vim1
2 files changed, 6 insertions, 0 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index ec3f89da32..763ed99914 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1982,6 +1982,11 @@ local pattern = {
['.*/Xresources/.*'] = starsetf('xdefaults'),
['.*/app%-defaults/.*'] = starsetf('xdefaults'),
['.*/etc/xinetd%.conf'] = 'xinetd',
+ ['.*/usr/share/X11/xkb/compat/.*'] = starsetf('xkb'),
+ ['.*/usr/share/X11/xkb/geometry/.*'] = starsetf('xkb'),
+ ['.*/usr/share/X11/xkb/keycodes/.*'] = starsetf('xkb'),
+ ['.*/usr/share/X11/xkb/symbols/.*'] = starsetf('xkb'),
+ ['.*/usr/share/X11/xkb/types/.*'] = starsetf('xkb'),
['.*/etc/blkid%.tab'] = 'xml',
['.*/etc/blkid%.tab%.old'] = 'xml',
['.*%.vbproj%.user'] = 'xml',
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index fbb56718a9..5cce0f0cc8 100644
--- a/test/old/testdir/test_filetype.vim
+++ b/test/old/testdir/test_filetype.vim
@@ -722,6 +722,7 @@ func s:GetFilenameChecks() abort
\ 'xf86conf': ['xorg.conf', 'xorg.conf-4'],
\ 'xhtml': ['file.xhtml', 'file.xht'],
\ 'xinetd': ['/etc/xinetd.conf', '/etc/xinetd.d/file', 'any/etc/xinetd.conf', 'any/etc/xinetd.d/file'],
+ \ 'xkb': ['/usr/share/X11/xkb/compat/pc', '/usr/share/X11/xkb/geometry/pc', '/usr/share/X11/xkb/keycodes/evdev', '/usr/share/X11/xkb/symbols/pc', '/usr/share/X11/xkb/types/pc'],
\ 'xmath': ['file.msc', 'file.msf'],
\ 'xml': ['/etc/blkid.tab', '/etc/blkid.tab.old', 'file.xmi', 'file.csproj', 'file.csproj.user', 'file.fsproj', 'file.fsproj.user', 'file.vbproj', 'file.vbproj.user', 'file.ui', 'file.tpm', '/etc/xdg/menus/file.menu', 'fglrxrc', 'file.xlf', 'file.xliff', 'file.xul', 'file.wsdl', 'file.wpl', 'any/etc/blkid.tab', 'any/etc/blkid.tab.old', 'any/etc/xdg/menus/file.menu', 'file.atom', 'file.rss', 'file.cdxml', 'file.psc1', 'file.mpd'],
\ 'xmodmap': ['anyXmodmap', 'Xmodmap', 'some-Xmodmap', 'some-xmodmap', 'some-xmodmap-file', 'xmodmap', 'xmodmap-file'],