diff options
| author | Wu, Zhenyu <wuzhenyu@ustc.edu> | 2024-04-09 22:49:19 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-04-09 22:49:19 +0200 |
| commit | d2b95b8446233e0021a8c0cd672f8fae748e3955 (patch) | |
| tree | ff5c79d0bf0279db9ef2db3d121b6f846d8eac78 | |
| parent | 08b0f632c125514fe0ea188c36ac048d7d7929d4 (diff) | |
patch 9.1.0295: filetype: pip config files are not recognizedv9.1.0295
Problem: filetype: pip config files are not recognized
Solution: detect pip.conf as dosini filetype
(Wu, Zhenyu)
closes: #14448
Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | runtime/filetype.vim | 4 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 6e93616281..14f633a2ac 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -531,9 +531,9 @@ au BufNewFile,BufRead m3makefile,m3overrides setf m3build " XDG mimeapps.list au BufNewFile,BufRead mimeapps.list setf dosini -" Many Python tools use dosini as their config, like setuptools, pudb, coverage +" Many Python tools use dosini as their config, like pip, setuptools, pudb, coverage " (must be before *.cfg) -au BufNewFile,BufRead setup.cfg,pudb.cfg,.coveragerc setf dosini +au BufNewFile,BufRead pip.conf,setup.cfg,pudb.cfg,.coveragerc setf dosini " LXQt's programs use dosini as their config au BufNewFile,BufRead */{lxqt,screengrab}/*.conf setf dosini diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 1c61b0d6eb..0af6e63d87 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -210,7 +210,7 @@ def s:GetFilenameChecks(): dict<list<string>> 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', 'any/.config/lxqt/globalkeyshortcuts.conf', 'any/.config/screengrab/screengrab.conf'], + 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', 'pip.conf', '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'], diff --git a/src/version.c b/src/version.c index f39d30a1d3..2c6e7d02fd 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 295, +/**/ 294, /**/ 293, |