Mercurial > vim
changeset 34848:1d9041415ca0 v9.1.0293
patch 9.1.0293: filetype: lxqt config files are not recognized
Commit: https://github.com/vim/vim/commit/41208884b8c1a73b42ddb6c1e5f008dae6aa0a83
Author: Wu, Zhenyu <wuzhenyu@ustc.edu>
Date: Tue Apr 9 22:39:53 2024 +0200
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: #14450
Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 09 Apr 2024 22:45:02 +0200 |
| parents | a594d5cfb1cc |
| children | 34256e3fdc94 |
| files | runtime/filetype.vim src/testdir/test_filetype.vim src/version.c |
| diffstat | 3 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -535,6 +535,9 @@ au BufNewFile,BufRead mimeapps.list setf " (must be before *.cfg) au BufNewFile,BufRead setup.cfg,pudb.cfg,.coveragerc setf dosini +" LXQt's programs use dosini as their config +au BufNewFile,BufRead */{lxqt,screengrab}/*.conf setf dosini + " Quake au BufNewFile,BufRead *baseq[2-3]/*.cfg,*id1/*.cfg setf quake au BufNewFile,BufRead *quake[1-3]/*.cfg setf quake @@ -542,6 +545,11 @@ au BufNewFile,BufRead *quake[1-3]/*.cfg " Quake C au BufNewFile,BufRead *.qc setf c +" LaTeX packages use LaTeX as their configuration, such as: +" ~/.texlive/texmf-config/tex/latex/hyperref/hyperref.cfg +" ~/.texlive/texmf-config/tex/latex/docstrip/docstrip.cfg +au BufNewFile,BufRead */tex/latex/**.cfg setf tex + " Configure files au BufNewFile,BufRead *.cfg\c call dist#ft#FTcfg() @@ -2333,11 +2341,6 @@ au BufRead,BufNewFile *.tfvars setf te au BufNewFile,BufRead *.latex,*.sty,*.dtx,*.ltx,*.bbl setf tex au BufNewFile,BufRead *.tex call dist#ft#FTtex() -" LaTeX packages use LaTeX as their configuration, such as: -" ~/.texlive/texmf-config/tex/latex/hyperref/hyperref.cfg -" ~/.texlive/texmf-config/tex/latex/docstrip/docstrip.cfg -au BufNewFile,BufRead */tex/latex/**.cfg setf tex - " LaTeX packages will generate some medium LaTeX files during compiling " They should be ignored by .gitignore https://github.com/github/gitignore/blob/main/TeX.gitignore " Sometime we need to view its content for debugging
--- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -210,7 +210,7 @@ def s:GetFilenameChecks(): dict<list<str 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'],