patch 9.1.0777: filetype: Some upstream php files are not recognized
Commit:
https://github.com/vim/vim/commit/367499c5c39057bca267716d9aad20554d4d83fd
Author: nisbet-hubbard <87453615+nisbet-hubb...@users.noreply.github.com>
Date: Sat Oct 12 17:19:58 2024 +0200
patch 9.1.0777: filetype: Some upstream php files are not recognized
Problem: filetype: Some upstream php files are not recognized
Solution: Detect more config files from the PHP source
distribution as filetype ini (nisbet-hubbard).
closes: #15840
Signed-off-by: nisbet-hubbard
<87453615+nisbet-hubb...@users.noreply.github.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 676994f78..a0f3f4afd 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1800,7 +1800,7 @@ au BufNewFile,BufRead *.pod setf pod
au BufNewFile,BufRead *.php,*.php\d,*.phtml,*.ctp,*.phpt,*.theme setf php
" PHP config
-au BufNewFile,BufRead php.ini-* setf dosini
+au BufNewFile,BufRead php.ini-*,php-fpm.conf*,www.conf* setf
dosini
" Pike and Cmod
au BufNewFile,BufRead *.pike,*.pmod setf pike
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 74167cb5f..474d51312 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -226,7 +226,7 @@ def s:GetFilenameChecks(): dict<list<string>>
dockerfile: ['Containerfile', 'Dockerfile', 'dockerfile',
'file.Dockerfile', 'file.dockerfile', 'Dockerfile.debian',
'Containerfile.something'],
dosbatch: ['file.bat'],
dosini: ['/etc/yum.conf', '/etc/nfs.conf', '/etc/nfsmount.conf',
'file.ini',
- 'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file',
+ 'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file',
'php-fpm.conf', 'php-fpm.conf.default', 'www.conf', 'www.conf.default',
'/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', '.pypirc', '.gitlint', '.oelint.cfg', 'pylintrc',
'.pylintrc',
diff --git a/src/version.c b/src/version.c
index 5dbd50044..53af2406b 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 */
+/**/
+ 777,
/**/
776,
/**/
--
--
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/E1sze4B-00CE4J-Mx%40256bit.org.
