To: vim_dev@googlegroups.com
Subject: Patch 8.2.2135
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.2135
Problem:    Vim9: #{ still seen as start of dict in some places.
Solution:   Remove check for { after #. (closes #7456)
Files:      src/ex_docmd.c, src/testdir/test_vim9_script.vim


*** ../vim-8.2.2134/src/ex_docmd.c	2020-12-12 14:33:37.096920916 +0100
--- src/ex_docmd.c	2020-12-12 21:23:37.185779425 +0100
***************
*** 1683,1689 ****
  {
  #ifdef FEAT_EVAL
      if (in_vim9script())
! 	return p[0] == '#' && p[1] != '{' && !starts_with_colon;
  #endif
      return *p == '"';
  }
--- 1683,1689 ----
  {
  #ifdef FEAT_EVAL
      if (in_vim9script())
! 	return p[0] == '#' && !starts_with_colon;
  #endif
      return *p == '"';
  }
***************
*** 4780,4786 ****
  		|| (*p == '#'
  		    && in_vim9script()
  		    && !(eap->argt & EX_NOTRLCOM)
- 		    && p[1] != '{'
  		    && p > eap->cmd && VIM_ISWHITE(p[-1]))
  #endif
  		|| *p == '|' || *p == '\n')
--- 4780,4785 ----
*** ../vim-8.2.2134/src/testdir/test_vim9_script.vim	2020-12-10 21:01:26.772252256 +0100
--- src/testdir/test_vim9_script.vim	2020-12-12 21:24:49.477515617 +0100
***************
*** 2069,2075 ****
--- 2069,2089 ----
    CheckScriptSuccess([
        'vim9script',
        '# something',
+       '#something',
+       '#{something',
        ])
+ 
+   split Xfile
+   CheckScriptSuccess([
+       'vim9script',
+       'edit #something',
+       ])
+   CheckScriptSuccess([
+       'vim9script',
+       'edit #{something',
+       ])
+   close
+ 
    CheckScriptFailure([
        'vim9script',
        ':# something',
*** ../vim-8.2.2134/src/version.c	2020-12-12 20:42:16.123207537 +0100
--- src/version.c	2020-12-12 21:08:07.145205666 +0100
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2135,
  /**/

-- 
(letter from Mark to Mike, about the film's probable certificate)
      For an 'A' we would have to: Lose as many shits as possible; Take Jesus
      Christ out, if possible; Loose "I fart in your general direction"; Lose
      "the oral sex"; Lose "oh, fuck off"; Lose "We make castanets out of your
      testicles"
                 "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    ///