diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-08-09 17:54:32 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-08-14 18:20:30 -0400 |
| commit | 5e95e0da44c9c2d09146e5966c67a969f9237650 (patch) | |
| tree | 16f8d4dcd03c7690ae69a9cc5af2cf530c3ea7f1 | |
| parent | 4eb89e7f9b54db31d7e1cb9f10c734cb041875df (diff) | |
| download | rneovim-5e95e0da44c9c2d09146e5966c67a969f9237650.tar.gz rneovim-5e95e0da44c9c2d09146e5966c67a969f9237650.tar.bz2 rneovim-5e95e0da44c9c2d09146e5966c67a969f9237650.zip | |
vim-patch:8.2.1409: nmpmrc and php.ini filetypes not recognized
Problem: Nmpmrc and php.ini filetypes not recognized.
Solution: Add filetype detection. (Doug Kearns)
https://github.com/vim/vim/commit/1e91eafc2e19b84ea44347ea929d2791d2fdd5e3
| -rw-r--r-- | runtime/filetype.vim | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index c0d656107c..9ccb57bed0 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1089,6 +1089,9 @@ au BufNewFile,BufRead .netrc setf netrc " Ninja file au BufNewFile,BufRead *.ninja setf ninja +" NPM RC file +au BufNewFile,BufRead npmrc,.npmrc setf dosini + " Novell netware batch files au BufNewFile,BufRead *.ncf setf ncf @@ -1195,6 +1198,9 @@ au BufNewFile,BufRead *.pod6 setf pod6 " Also .ctp for Cake template file au BufNewFile,BufRead *.php,*.php\d,*.phtml,*.ctp setf php +" PHP config +au BufNewFile,BufRead php.ini,php.ini-* setf dosini + " Pike and Cmod au BufNewFile,BufRead *.pike,*.pmod setf pike au BufNewFile,BufRead *.cmod setf cmod diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 2e280417ae..0acb5da8ba 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -140,7 +140,7 @@ let s:filename_checks = { \ 'dnsmasq': ['/etc/dnsmasq.conf'], \ 'dockerfile': ['Dockerfile', 'file.Dockerfile'], \ 'dosbatch': ['file.bat', 'file.sys'], - \ 'dosini': ['.editorconfig', '/etc/pacman.conf', '/etc/yum.conf', 'file.ini'], + \ 'dosini': ['.editorconfig', '/etc/pacman.conf', '/etc/yum.conf', 'file.ini', 'npmrc', '.npmrc', 'php.ini', 'php.ini-5'], \ 'dot': ['file.dot', 'file.gv'], \ 'dracula': ['file.drac', 'file.drc', 'filelvs', 'filelpe'], \ 'dsl': ['file.dsl'], |