To: vim_dev@googlegroups.com Subject: Patch 8.2.3690 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3690 Problem: Vim9: "filter #pat# cmd" does not work. Solution: Do not see #pat# as a comment. Files: src/ex_docmd.c, src/testdir/test_vim9_cmd.vim *** ../vim-8.2.3689/src/ex_docmd.c 2021-11-24 12:17:49.168449919 +0000 --- src/ex_docmd.c 2021-11-28 20:14:38.324138261 +0000 *************** *** 2910,2916 **** int c = 0; if (!checkforcmd_noparen(&p, "filter", 4) ! || *p == NUL || ends_excmd(*p)) break; if (*p == '!') { --- 2910,2923 ---- int c = 0; if (!checkforcmd_noparen(&p, "filter", 4) ! || *p == NUL ! || (ends_excmd(*p) ! #ifdef FEAT_EVAL ! // in ":filter #pat# cmd" # does not ! // start a comment ! && (!in_vim9script() || VIM_ISWHITE(p[1])) ! #endif ! )) break; if (*p == '!') { *** ../vim-8.2.3689/src/testdir/test_vim9_cmd.vim 2021-11-27 11:42:46.346486505 +0000 --- src/testdir/test_vim9_cmd.vim 2021-11-28 20:23:20.571593995 +0000 *************** *** 714,719 **** --- 714,729 ---- assert_match('very specific z3d37dh234 string', Screenline(&lines)) END CheckDefAndScriptSuccess(lines) + + lines =<< trim END + edit foobar + redir => g:filter_out + filter #foobar# ls + redir END + assert_match('"foobar"', g:filter_out) + unlet g:filter_out + END + CheckDefAndScriptSuccess(lines) enddef def Test_win_command_modifiers() *** ../vim-8.2.3689/src/version.c 2021-11-28 19:53:34.038422762 +0000 --- src/version.c 2021-11-28 20:08:20.508326307 +0000 *************** *** 759,760 **** --- 759,762 ---- { /* Add new patch number below this line */ + /**/ + 3690, /**/ -- (letter from Mark to Mike, about the film's probable certificate) I would like to get back to the Censor and agree to lose the shits, take the odd Jesus Christ out and lose Oh fuck off, but to retain 'fart in your general direction', 'castanets of your testicles' and 'oral sex' and ask him for an 'A' rating on that basis. "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/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///