aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-04-12 17:15:54 +0800
committerzeertzjq <zeertzjq@outlook.com>2024-04-12 17:17:39 +0800
commit60ced890f38c8f717c9dae92a9bf2819f6b00ef8 (patch)
tree9a172c7ec2b17a382cf4e80101d2ca6b742eddd3
parentb0ded426807f56cdd5331b8dcb9094d90917c89c (diff)
downloadrneovim-60ced890f38c8f717c9dae92a9bf2819f6b00ef8.tar.gz
rneovim-60ced890f38c8f717c9dae92a9bf2819f6b00ef8.tar.bz2
rneovim-60ced890f38c8f717c9dae92a9bf2819f6b00ef8.zip
vim-patch:9.1.0293: filetype: lxqt config files are not recognized
Problem: filetype: lxqt config files are not recognized Solution: Detect {lxqt,screengrab}/*.conf files as dosini, fix failing filetype test for */tex/latex/**.cfg (Wu, Zhenyu) closes: vim/vim#14450 https://github.com/vim/vim/commit/41208884b8c1a73b42ddb6c1e5f008dae6aa0a83 Co-authored-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
-rw-r--r--runtime/lua/vim/filetype.lua2
-rw-r--r--test/old/testdir/test_filetype.vim2
2 files changed, 3 insertions, 1 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index bccdbd1ba4..6dec2e6d16 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1735,6 +1735,8 @@ local pattern = {
['.*/%.aws/credentials'] = 'confini',
['.*/etc/pacman%.conf'] = 'confini',
['.*/etc/yum%.conf'] = 'dosini',
+ ['.*/lxqt/.*%.conf'] = 'dosini',
+ ['.*/screengrab/.*%.conf'] = 'dosini',
['.*lvs'] = 'dracula',
['.*lpe'] = 'dracula',
['.*/dtrace/.*%.d'] = 'dtrace',
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index bcd65ee7f5..3fcd1a0c8a 100644
--- a/test/old/testdir/test_filetype.vim
+++ b/test/old/testdir/test_filetype.vim
@@ -213,7 +213,7 @@ func s:GetFilenameChecks() abort
\ 'dnsmasq': ['/etc/dnsmasq.conf', '/etc/dnsmasq.d/file', 'any/etc/dnsmasq.conf', 'any/etc/dnsmasq.d/file'],
\ 'dockerfile': ['Containerfile', 'Dockerfile', 'dockerfile', 'file.Dockerfile', 'file.dockerfile', 'Dockerfile.debian', 'Containerfile.something'],
\ 'dosbatch': ['file.bat'],
- \ 'dosini': ['/etc/yum.conf', 'file.ini', 'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file', '/etc/yum.repos.d/file', 'any/etc/yum.conf', 'any/etc/yum.repos.d/file', 'file.wrap', 'file.vbp', 'ja2.ini', 'JA2.INI', 'mimeapps.list', 'setup.cfg', 'pudb.cfg', '.coveragerc', 'psprint.conf', 'sofficerc'],
+ \ 'dosini': ['/etc/yum.conf', 'file.ini', 'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file', '/etc/yum.repos.d/file', 'any/etc/yum.conf', 'any/etc/yum.repos.d/file', 'file.wrap', 'file.vbp', 'ja2.ini', 'JA2.INI', 'mimeapps.list', 'setup.cfg', 'pudb.cfg', '.coveragerc', 'psprint.conf', 'sofficerc', 'any/.config/lxqt/globalkeyshortcuts.conf', 'any/.config/screengrab/screengrab.conf'],
\ 'dot': ['file.dot', 'file.gv'],
\ 'dracula': ['file.drac', 'file.drc', 'filelvs', 'filelpe', 'drac.file', 'lpe', 'lvs', 'some-lpe', 'some-lvs'],
\ 'dtd': ['file.dtd'],