diff options
| -rw-r--r-- | runtime/scripts.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/runtime/scripts.vim b/runtime/scripts.vim index fe05d265b3..e271db89dc 100644 --- a/runtime/scripts.vim +++ b/runtime/scripts.vim @@ -137,7 +137,7 @@ if s:line1 =~# "^#!" set ft=ruby " JavaScript - elseif s:name =~# 'node\(js\)\=\>' || s:name =~# 'rhino\>' + elseif s:name =~# 'node\(js\)\=\>\|js\>' || s:name =~# 'rhino\>' set ft=javascript " BC calculator diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index ccf8016839..62dbc7473f 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -561,10 +561,13 @@ let s:script_checks = { \ 'perl6': [['#!/path/perl6']], \ 'perl': [['#!/path/perl']], \ 'php': [['#!/path/php']], - \ 'python': [['#!/path/python']], + \ 'python': [['#!/path/python'], + \ ['#!/path/python2'], + \ ['#!/path/python3']], \ 'groovy': [['#!/path/groovy']], \ 'ruby': [['#!/path/ruby']], \ 'javascript': [['#!/path/node'], + \ ['#!/path/js'], \ ['#!/path/nodejs'], \ ['#!/path/rhino']], \ 'bc': [['#!/path/bc']], diff --git a/src/version.c b/src/version.c index 811d521054..352d491bfa 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1465, +/**/ 1464, /**/ 1463, |