Patch 8.2.3451
Problem: Not all apache files are recognized.
Solution: Adjust the filetype pattern. (Zdenek Dohnal, closes #8882)
Files: runtime/filetype.vim, src/testdir/test_filetype.vim
*** ../vim-8.2.3450/runtime/filetype.vim 2021-09-03 19:21:31.271026051
+0200
--- runtime/filetype.vim 2021-09-20 20:54:23.832181786 +0200
***************
*** 2138,2144 ****
" More Apache config files
au BufNewFile,BufRead
access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf* call
s:StarSetf('apache')
! au BufNewFile,BufRead
*/etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.d/*.conf*
call s:StarSetf('apache')
" Asterisk config file
au BufNewFile,BufRead *asterisk/*.conf* call
s:StarSetf('asterisk')
--- 2138,2144 ----
" More Apache config files
au BufNewFile,BufRead
access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf* call
s:StarSetf('apache')
! au BufNewFile,BufRead
*/etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.*/*,*/etc/httpd/mods-*/*,*/etc/httpd/sites-*/*,*/etc/httpd/conf.d/*.conf*
call s:StarSetf('apache')
" Asterisk config file
au BufNewFile,BufRead *asterisk/*.conf* call
s:StarSetf('asterisk')
*** ../vim-8.2.3450/src/testdir/test_filetype.vim 2021-09-12
17:03:04.856023559 +0200
--- src/testdir/test_filetype.vim 2021-09-20 20:54:23.832181786 +0200
***************
*** 59,65 ****
\ 'aml': ['file.aml'],
\ 'ampl': ['file.run'],
\ 'ant': ['build.xml'],
! \ 'apache': ['.htaccess', '/etc/httpd/file.conf',
'/etc/apache2/sites-2/file.com', '/etc/apache2/some.config',
'/etc/apache2/conf.file/conf', '/etc/apache2/mods-some/file',
'/etc/apache2/sites-some/file', '/etc/httpd/conf.d/file.config',
'/etc/apache2/conf.file/file', '/etc/apache2/file.conf',
'/etc/apache2/file.conf-file', '/etc/apache2/mods-file/file',
'/etc/apache2/sites-file/file', '/etc/apache2/sites-file/file.com',
'/etc/httpd/conf.d/file.conf', '/etc/httpd/conf.d/file.conf-file',
'access.conf', 'access.conf-file', 'any/etc/apache2/conf.file/file',
'any/etc/apache2/file.conf', 'any/etc/apache2/file.conf-file',
'any/etc/apache2/mods-file/file', 'any/etc/apache2/sites-file/file',
'any/etc/apache2/sites-file/file.com', 'any/etc/httpd/conf.d/file.conf',
'any/etc/httpd/conf.d/file.conf-file', 'any/etc/httpd/file.conf',
'apache.conf', 'apache.conf-file', 'apache2.conf', 'apache2.conf-file',
'httpd.conf', 'httpd.conf-file', 'srm.conf', 'srm.conf-file'],
\ 'apachestyle': ['/etc/proftpd/file.config,/etc/proftpd/conf.file/file',
'/etc/proftpd/conf.file/file', '/etc/proftpd/file.conf',
'/etc/proftpd/file.conf-file', 'any/etc/proftpd/conf.file/file',
'any/etc/proftpd/file.conf', 'any/etc/proftpd/file.conf-file', 'proftpd.conf',
'proftpd.conf-file'],
\ 'applescript': ['file.scpt'],
\ 'aptconf': ['apt.conf', '/.aptitude/config', 'any/.aptitude/config'],
--- 59,65 ----
\ 'aml': ['file.aml'],
\ 'ampl': ['file.run'],
\ 'ant': ['build.xml'],
! \ 'apache': ['.htaccess', '/etc/httpd/file.conf',
'/etc/apache2/sites-2/file.com', '/etc/apache2/some.config',
'/etc/apache2/conf.file/conf', '/etc/apache2/mods-some/file',
'/etc/apache2/sites-some/file', '/etc/httpd/conf.d/file.config',
'/etc/apache2/conf.file/file', '/etc/apache2/file.conf',
'/etc/apache2/file.conf-file', '/etc/apache2/mods-file/file',
'/etc/apache2/sites-file/file', '/etc/apache2/sites-file/file.com',
'/etc/httpd/conf.d/file.conf', '/etc/httpd/conf.d/file.conf-file',
'access.conf', 'access.conf-file', 'any/etc/apache2/conf.file/file',
'any/etc/apache2/file.conf', 'any/etc/apache2/file.conf-file',
'any/etc/apache2/mods-file/file', 'any/etc/apache2/sites-file/file',
'any/etc/apache2/sites-file/file.com', 'any/etc/httpd/conf.d/file.conf',
'any/etc/httpd/conf.d/file.conf-file', 'any/etc/httpd/file.conf',
'apache.conf', 'apache.conf-file', 'apache2.conf', 'apache2.conf-file',
'httpd.conf', 'httpd.conf-file', 'srm.conf', 'srm.conf-file',
'/etc/httpd/mods-some/file
', '/etc/httpd/sites-some/file', '/etc/httpd/conf.file/conf'],
\ 'apachestyle': ['/etc/proftpd/file.config,/etc/proftpd/conf.file/file',
'/etc/proftpd/conf.file/file', '/etc/proftpd/file.conf',
'/etc/proftpd/file.conf-file', 'any/etc/proftpd/conf.file/file',
'any/etc/proftpd/file.conf', 'any/etc/proftpd/file.conf-file', 'proftpd.conf',
'proftpd.conf-file'],
\ 'applescript': ['file.scpt'],
\ 'aptconf': ['apt.conf', '/.aptitude/config', 'any/.aptitude/config'],
*** ../vim-8.2.3450/src/version.c 2021-09-19 17:54:39.364199315 +0200
--- src/version.c 2021-09-20 20:56:04.728041598 +0200
***************
*** 759,760 ****
--- 759,762 ----
{ /* Add new patch number below this line */
+ /**/
+ 3451,
/**/
--
Just remember...if the world didn't suck, we'd all fall off.
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
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 [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/202109201858.18KIw9Xf3057238%40masaka.moolenaar.net.
