patch 9.0.2061: not able to detect xkb filetypes
Commit:
https://github.com/vim/vim/commit/ae9021a840db3253b0e0cb84186faae73368afd7
Author: Guido Cella <[email protected]>
Date: Mon Oct 23 19:19:46 2023 +0200
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: #13401
Signed-off-by: Christian Brabandt <[email protected]>
Co-authored-by: Guido Cella <[email protected]>
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 6fef4b77a..07d6bbfca 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2862,6 +2862,9 @@ au BufNewFile,BufRead XF86Config*
\|endif
\|call s:StarSetf('xf86conf')
+" XKB
+au BufNewFile,BufRead
*/usr/share/X11/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 bfaab514e..f68ad00dd 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -800,6 +800,7 @@ 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'],
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'],
diff --git a/src/version.c b/src/version.c
index 37a31fdac..a8de25a1f 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 */
+/**/
+ 2061,
/**/
2060,
/**/
--
--
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 [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1quykg-00203A-HK%40256bit.org.
