mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-05 19:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1133: filetype: xkb files not recognized everywhere

Browse Source 
Problem:  filetype: xkb files not recognized everywhere
Solution: detect xkb files in more places
          (David Mandelberg)

References:
https://xkbcommon.org/doc/current/user-configuration.html#user-config-locations

closes: vim/vim#16684

b62bf81488

Co-authored-by: David Mandelberg <david@mandelberg.org>
This commit is contained in:
Christian Clason
2025-02-22 11:01:28 +01:00
committed by Christian Clason
parent 90958c3648
commit 010684e024
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/lua/vim/filetype.lua
View File

@@ -2150,11 +2150,6 @@ local pattern = {
['/usr/.*/gnupg/options%.skel$'] = 'gpg',
['/usr/share/upstart/.*%.conf$'] = 'upstart',
['/usr/share/upstart/.*%.override$'] = 'upstart',
['/usr/share/X11/xkb/compat/'] = detect_xkb,
['/usr/share/X11/xkb/geometry/'] = detect_xkb,
['/usr/share/X11/xkb/keycodes/'] = detect_xkb,
['/usr/share/X11/xkb/symbols/'] = detect_xkb,
['/usr/share/X11/xkb/types/'] = detect_xkb,
},
['/var/'] = {
['/var/backups/group%.bak$'] = 'group',
@@ -2329,6 +2324,13 @@ local pattern = {
['^Neomuttrc'] = detect_neomuttrc,
['%.neomuttdebug'] = 'neomuttlog',
},
['/%.?xkb/'] = {
['/%.?xkb/compat/'] = detect_xkb,
['/%.?xkb/geometry/'] = detect_xkb,
['/%.?xkb/keycodes/'] = detect_xkb,
['/%.?xkb/symbols/'] = detect_xkb,
['/%.?xkb/types/'] = detect_xkb,
},
['^%.'] = {
['^%.cshrc'] = detect.csh,
['^%.login'] = detect.csh,

3
test/old/testdir/test_filetype.vim
View File

@@ -880,7 +880,8 @@ 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'],
\ 'xkb': ['any/xkb/compat/pc', 'any/xkb/geometry/pc', 'any/xkb/keycodes/evdev', 'any/xkb/symbols/pc', 'any/xkb/types/pc',
\ 'any/.xkb/compat/pc', 'any/.xkb/geometry/pc', 'any/.xkb/keycodes/evdev', 'any/.xkb/symbols/pc', 'any/.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',