# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1646478904 -3600
# Node ID 80f398bfc19f3e56f22a28a59f0d3c75849f7108
# Parent  735bd3823bb50f55d5e24615ce79311b63560144
patch 8.2.4508: Vim9: cannot assign to a global variable on the command line

Commit: https://github.com/vim/vim/commit/330a388e18ad6b64c3574c712db675258b0e9878
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Mar 5 11:05:57 2022 +0000

    patch 8.2.4508: Vim9: cannot assign to a global variable on the command line

    Problem:    Vim9: cannot assign to a global variable on the command line.
    Solution:   Allow using :vim9cmd for assignment on the command line.

diff --git a/src/evalvars.c b/src/evalvars.c
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -754,12 +754,14 @@ heredoc_get(exarg_T *eap, char_u *cmd, i
     void
 ex_var(exarg_T *eap)
 {
+    char_u *p = eap->cmd;
+
     if (!in_vim9script())
     {
 	semsg(_(e_str_cannot_be_used_in_legacy_vim_script), ":var");
 	return;
     }
-    if (current_sctx.sc_sid == 0)
+    if (current_sctx.sc_sid == 0 && checkforcmd_noparen(&p, "var", 3))
     {
 	emsg(_(e_cannot_declare_variable_on_command_line));
 	return;
diff --git a/src/testdir/dumps/Test_vim9_reject_declaration.dump b/src/testdir/dumps/Test_vim9_reject_declaration_1.dump
rename from src/testdir/dumps/Test_vim9_reject_declaration.dump
rename to src/testdir/dumps/Test_vim9_reject_declaration_1.dump
diff --git a/src/testdir/dumps/Test_vim9_reject_declaration_2.dump b/src/testdir/dumps/Test_vim9_reject_declaration_2.dump
new file mode 100644
--- /dev/null
+++ b/src/testdir/dumps/Test_vim9_reject_declaration_2.dump
@@ -0,0 +1,6 @@
+> +0&#ffffff0@74
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|1+0#0000000&|2|3| @53|0|,|0|-|1| @8|A|l@1| 
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -3365,7 +3365,10 @@ endfunc
 def Run_test_reject_declaration()
   var buf = g:RunVimInTerminal('', {'rows': 6})
   term_sendkeys(buf, ":vim9cmd var x: number\<CR>")
-  g:VerifyScreenDump(buf, 'Test_vim9_reject_declaration', {})
+  g:VerifyScreenDump(buf, 'Test_vim9_reject_declaration_1', {})
+  term_sendkeys(buf, ":\<CR>")
+  term_sendkeys(buf, ":vim9cmd g:foo = 123 | echo g:foo\<CR>")
+  g:VerifyScreenDump(buf, 'Test_vim9_reject_declaration_2', {})
 
   # clean up
   g:StopVimInTerminal(buf)
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4508,
+/**/
     4507,
 /**/
     4506,