From 367499c5c39057bca267716d9aad20554d4d83fd Mon Sep 17 00:00:00 2001 From: nisbet-hubbard <87453615+nisbet-hubbard@users.noreply.github.com> Date: Sat, 12 Oct 2024 17:19:58 +0200 Subject: [PATCH] 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 --- runtime/filetype.vim | 2 +- src/testdir/test_filetype.vim | 2 +- src/version.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 676994f78a..a0f3f4afd4 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 74167cb5fb..474d513124 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -226,7 +226,7 @@ def s:GetFilenameChecks(): dict> 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 5dbd50044f..53af2406b4 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, /**/