diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-09 19:32:39 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-09 19:32:39 +0200 |
| commit | 1e91eafc2e19b84ea44347ea929d2791d2fdd5e3 (patch) | |
| tree | 8cb13acbe84074bbbcd06f0641b92891b2e1bfa9 | |
| parent | 64d662d5fc2ff8af4dbf399ff02aa9d711cc9312 (diff) | |
| download | vim-git-1e91eafc2e19b84ea44347ea929d2791d2fdd5e3.tar.gz | |
patch 8.2.1409: nmpmrc and php.ini filetypes not recognizedv8.2.1409
Problem: Nmpmrc and php.ini filetypes not recognized.
Solution: Add filetype detection. (Doug Kearns)
| -rw-r--r-- | runtime/filetype.vim | 6 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 106eb3791..dfbfaabae 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1093,6 +1093,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 @@ -1199,6 +1202,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/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 2e517c0bb..cd7200817 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -140,7 +140,7 @@ let s:filename_checks = { \ 'dnsmasq': ['/etc/dnsmasq.conf'], \ 'dockerfile': ['Containerfile', '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'], diff --git a/src/version.c b/src/version.c index b7667bf4c..0cd89d67a 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1409, +/**/ 1408, /**/ 1407, |