patch 9.0.1806: Vim9: bogus error on export
Problem: Vim9: bogus error on export
Solution: Don't error out when the export command is not executed
closes: #12912
closes: #12930
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: LemonBoy <thatlemon@gmail.com>
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 8fda332..32d52ab 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2586,8 +2586,8 @@
#ifdef FEAT_EVAL
// A command will reset "is_export" when exporting an item. If it is still
- // set something went wrong.
- if (is_export)
+ // set something went wrong or the command was never executed.
+ if (!ea.skip && is_export)
{
if (errormsg == NULL)
errormsg = _(e_export_with_invalid_argument);
diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index 7d3691a..d470a34 100644
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -2919,5 +2919,15 @@
endif
enddef
+def Test_export_in_conditional_block()
+ var lines =<< trim END
+ vim9script
+ if exists('this_will_fail')
+ export var MyVar = "hello"
+ endif
+ END
+ v9.CheckScriptSuccess(lines)
+enddef
+
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/version.c b/src/version.c
index 39cac79..0d647ec 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1806,
+/**/
1805,
/**/
1804,