From 010684e0240d86ec88e25dd485b2044297bbf62e Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Sat, 22 Feb 2025 11:01:28 +0100 Subject: vim-patch:9.1.1133: filetype: xkb files not recognized everywhere 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 https://github.com/vim/vim/commit/b62bf814886185cb8607ce15051aa7017b8c88ba Co-authored-by: David Mandelberg --- runtime/lua/vim/filetype.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'runtime/lua') diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index 6974b6508d..3e6b99435d 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -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, -- cgit