# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1662576303 -7200
# Node ID d58afefecd6cad48c6fe5e3ff8fe16900c49c83c
# Parent  7571004d6f375b299dfba6244eb1b81750646fdf
patch 9.0.0409: #{g:x} was seen as a curly-braces expression

Commit: https://github.com/vim/vim/commit/7c7e1e9b98d4e5dbe7358c795a635c6f1f36f418
Author: ii14 <ii14@users.noreply.github.com>
Date:   Wed Sep 7 19:40:17 2022 +0100

    patch 9.0.0409: #{g:x} was seen as a curly-braces expression

    Problem:    #{g:x} was seen as a curly-braces expression.
    Solution:   Do never see #{} as a curly-braces expression. (closes https://github.com/vim/vim/issues/11075)

diff --git a/src/dict.c b/src/dict.c
--- a/src/dict.c
+++ b/src/dict.c
@@ -911,13 +911,15 @@ eval_dict(char_u **arg, typval_T *rettv,
     int		vim9script = in_vim9script();
     int		had_comma;
 
-    // First check if it's not a curly-braces thing: {expr}.
+    // First check if it's not a curly-braces expression: {expr}.
     // Must do this without evaluating, otherwise a function may be called
     // twice.  Unfortunately this means we need to call eval1() twice for the
     // first item.
-    // But {} is an empty Dictionary.
+    // "{}" is an empty Dictionary.
+    // "#{abc}" is never a curly-braces expression.
     if (!vim9script
 	    && *curly_expr != '}'
+	    && !literal
 	    && eval1(&curly_expr, &tv, NULL) == OK
 	    && *skipwhite(curly_expr) == '}')
 	return NOTDONE;
diff --git a/src/testdir/test_listdict.vim b/src/testdir/test_listdict.vim
--- a/src/testdir/test_listdict.vim
+++ b/src/testdir/test_listdict.vim
@@ -321,6 +321,10 @@ func Test_dict()
 
   " allow key starting with number at the start, not a curly expression
   call assert_equal({'1foo': 77}, #{1foo: 77})
+
+  " #{expr} is not a curly expression
+  let x = 'x'
+  call assert_equal(#{g: x}, #{g:x})
 endfunc
 
 " This was allowed in legacy Vim script
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    409,
+/**/
     408,
 /**/
     407,