Skip to content

Commit 367499c

Browse files
nisbet-hubbardchrisbra
authored andcommitted
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-hubbard@users.noreply.github.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent 05d0893 commit 367499c

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

runtime/filetype.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1800,7 +1800,7 @@ au BufNewFile,BufRead *.pod setf pod
18001800
au BufNewFile,BufRead *.php,*.php\d,*.phtml,*.ctp,*.phpt,*.theme setf php
18011801

18021802
" PHP config
1803-
au BufNewFile,BufRead php.ini-* setf dosini
1803+
au BufNewFile,BufRead php.ini-*,php-fpm.conf*,www.conf* setf dosini
18041804

18051805
" Pike and Cmod
18061806
au BufNewFile,BufRead *.pike,*.pmod setf pike

src/testdir/test_filetype.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ def s:GetFilenameChecks(): dict<list<string>>
226226
dockerfile: ['Containerfile', 'Dockerfile', 'dockerfile', 'file.Dockerfile', 'file.dockerfile', 'Dockerfile.debian', 'Containerfile.something'],
227227
dosbatch: ['file.bat'],
228228
dosini: ['/etc/yum.conf', '/etc/nfs.conf', '/etc/nfsmount.conf', 'file.ini',
229-
'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file',
229+
'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file', 'php-fpm.conf', 'php-fpm.conf.default', 'www.conf', 'www.conf.default',
230230
'/etc/yum.repos.d/file', 'any/etc/yum.conf', 'any/etc/yum.repos.d/file', 'file.wrap',
231231
'file.vbp', 'ja2.ini', 'JA2.INI', 'mimeapps.list', 'pip.conf', 'setup.cfg', 'pudb.cfg',
232232
'.coveragerc', '.pypirc', '.gitlint', '.oelint.cfg', 'pylintrc', '.pylintrc',

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
777,
707709
/**/
708710
776,
709711
/**/

0 commit comments

Comments
 (0)