To: vim_dev@googlegroups.com Subject: Patch 8.0.1465 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1465 Problem: Python2 and python3 detection not tested. (Matej Cepl) Solution: Add test for detecting python2 and python3. Also detect a script using "js" as javascript. Files: runtime/scripts.vim, src/testdir/test_filetype.vim *** ../vim-8.0.1464/runtime/scripts.vim 2018-02-03 15:43:11.031507374 +0100 --- runtime/scripts.vim 2018-02-03 22:31:58.513122948 +0100 *************** *** 133,139 **** set ft=ruby " JavaScript ! elseif s:name =~# 'node\(js\)\=\>' || s:name =~# 'rhino\>' set ft=javascript " BC calculator --- 133,139 ---- set ft=ruby " JavaScript ! elseif s:name =~# 'node\(js\)\=\>\|js\>' || s:name =~# 'rhino\>' set ft=javascript " BC calculator *** ../vim-8.0.1464/src/testdir/test_filetype.vim 2018-02-03 15:55:44.377562581 +0100 --- src/testdir/test_filetype.vim 2018-02-03 22:32:17.412982289 +0100 *************** *** 561,570 **** \ 'perl6': [['#!/path/perl6']], \ 'perl': [['#!/path/perl']], \ 'php': [['#!/path/php']], ! \ 'python': [['#!/path/python']], \ 'groovy': [['#!/path/groovy']], \ 'ruby': [['#!/path/ruby']], \ 'javascript': [['#!/path/node'], \ ['#!/path/nodejs'], \ ['#!/path/rhino']], \ 'bc': [['#!/path/bc']], --- 561,573 ---- \ 'perl6': [['#!/path/perl6']], \ 'perl': [['#!/path/perl']], \ 'php': [['#!/path/php']], ! \ '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']], *** ../vim-8.0.1464/src/version.c 2018-02-03 20:43:03.535138322 +0100 --- src/version.c 2018-02-03 22:34:04.848181822 +0100 *************** *** 773,774 **** --- 773,776 ---- { /* Add new patch number below this line */ + /**/ + 1465, /**/ -- TALL KNIGHT: We shall say Ni! again to you if you do not appease us. ARTHUR: All right! What do you want? TALL KNIGHT: We want ... a shrubbery! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///