To: vim_dev@googlegroups.com Subject: Patch 8.2.0930 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0930 Problem: Script filetype detection trips over env -S argument. Solution: Remove "-S" and "--ignore-environment". (closes #5013) Add tests. Files: runtime/scripts.vim, src/testdir/test_filetype.vim *** ../vim-8.2.0929/runtime/scripts.vim 2020-03-06 22:25:52.500279411 +0100 --- runtime/scripts.vim 2020-06-07 21:54:57.293343940 +0200 *************** *** 1,7 **** " Vim support file to detect file types in scripts " " Maintainer: Bram Moolenaar ! " Last change: 2019 Jun 25 " This file is called by an autocommand for every file that has just been " loaded into a buffer. It checks if the type of file can be recognized by --- 1,7 ---- " Vim support file to detect file types in scripts " " Maintainer: Bram Moolenaar ! " Last change: 2020 Jun 07 " This file is called by an autocommand for every file that has just been " loaded into a buffer. It checks if the type of file can be recognized by *************** *** 35,44 **** if s:line1 =~# "^#!" " A script that starts with "#!". ! " Check for a line like "#!/usr/bin/env VAR=val bash". Turn it into " "#!/usr/bin/bash" to make matching easier. if s:line1 =~# '^#!\s*\S*\\\"\", 'tx') call assert_equal('"setfiletype java javacc javascript javascriptreact', @:) *** ../vim-8.2.0929/src/version.c 2020-06-07 21:31:14.778405833 +0200 --- src/version.c 2020-06-07 21:57:05.572884274 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 930, /**/ -- Back up my hard drive? I can't find the reverse switch! /// 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 ///