patch 9.1.1133: filetype: xkb files not recognized everywhere
Commit:
https://github.com/vim/vim/commit/b62bf814886185cb8607ce15051aa7017b8c88ba
Author: David Mandelberg <da...@mandelberg.org>
Date: Fri Feb 21 20:09:35 2025 +0100
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: #16684
Signed-off-by: David Mandelberg <da...@mandelberg.org>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 46650e9c4..b4207942e 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -3273,7 +3273,7 @@ au BufNewFile,BufRead XF86Config*
\|call s:StarSetf('xf86conf')
" XKB
-au BufNewFile,BufRead
*/usr/share/X11/xkb/{compat,geometry,keycodes,symbols,types}/* call
s:StarSetf('xkb')
+au BufNewFile,BufRead */{,.}xkb/{compat,geometry,keycodes,symbols,types}/*
call s:StarSetf('xkb')
" X11 xmodmap
au BufNewFile,BufRead *xmodmap* call
s:StarSetf('xmodmap')
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 3125ffc99..6fe383d87 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -883,7 +883,8 @@ def s:GetFilenameChecks(): dict<list<string>>
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',
diff --git a/src/version.c b/src/version.c
index d09ba285c..f552a271d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1133,
/**/
1132,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1tlYUM-004xWQ-9U%40256bit.org.
