patch 9.1.0295: filetype: pip config files are not recognized
Commit:
https://github.com/vim/vim/commit/d2b95b8446233e0021a8c0cd672f8fae748e3955
Author: Wu, Zhenyu <wuzhe...@ustc.edu>
Date: Tue Apr 9 22:49:19 2024 +0200
patch 9.1.0295: filetype: pip config files are not recognized
Problem: filetype: pip config files are not recognized
Solution: detect pip.conf as dosini filetype
(Wu, Zhenyu)
closes: #14448
Signed-off-by: Wu, Zhenyu <wuzhe...@ustc.edu>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 6e9361628..14f633a2a 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 1c61b0d6e..0af6e63d8 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 f39d30a1d..2c6e7d02f 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 */
+/**/
+ 295,
/**/
294,
/**/
--
--
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 vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1ruIZZ-000t1S-Uw%40256bit.org.
