Skip to content

Commit b62bf81

Browse files
dseomnchrisbra
authored andcommitted
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 <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent 060e655 commit b62bf81

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

runtime/filetype.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3273,7 +3273,7 @@ au BufNewFile,BufRead XF86Config*
32733273
\|call s:StarSetf('xf86conf')
32743274

32753275
" XKB
3276-
au BufNewFile,BufRead */usr/share/X11/xkb/{compat,geometry,keycodes,symbols,types}/* call s:StarSetf('xkb')
3276+
au BufNewFile,BufRead */{,.}xkb/{compat,geometry,keycodes,symbols,types}/* call s:StarSetf('xkb')
32773277

32783278
" X11 xmodmap
32793279
au BufNewFile,BufRead *xmodmap* call s:StarSetf('xmodmap')

src/testdir/test_filetype.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,8 @@ def s:GetFilenameChecks(): dict<list<string>>
883883
xf86conf: ['xorg.conf', 'xorg.conf-4'],
884884
xhtml: ['file.xhtml', 'file.xht'],
885885
xinetd: ['/etc/xinetd.conf', '/etc/xinetd.d/file', 'any/etc/xinetd.conf', 'any/etc/xinetd.d/file'],
886-
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'],
886+
xkb: ['any/xkb/compat/pc', 'any/xkb/geometry/pc', 'any/xkb/keycodes/evdev', 'any/xkb/symbols/pc', 'any/xkb/types/pc',
887+
'any/.xkb/compat/pc', 'any/.xkb/geometry/pc', 'any/.xkb/keycodes/evdev', 'any/.xkb/symbols/pc', 'any/.xkb/types/pc'],
887888
xmath: ['file.msc', 'file.msf'],
888889
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',
889890
'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',

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
1133,
707709
/**/
708710
1132,
709711
/**/

0 commit comments

Comments
 (0)