summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-01-12 12:54:55 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-12 12:54:55 +0000
commitf479cac084c7ddd9f20944c8978d39f3ef092868 (patch)
treebf492c6ec32731b36f1db04e2fa13130818c6296
parentf111cdfae6edf697390e0d9a85082a6526b03da6 (diff)
downloadvim-git-f479cac084c7ddd9f20944c8978d39f3ef092868.tar.gz
patch 8.2.4068: Vim9: import test failsv8.2.4068
Problem: Vim9: import test fails. Solution: Add missing change.
-rw-r--r--src/scriptfile.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/scriptfile.c b/src/scriptfile.c
index 948866636..350813934 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -1274,7 +1274,8 @@ do_source(
// See if we loaded this script before.
sid = find_script_by_name(fname_exp);
- if (sid > 0 && ret_sid != NULL)
+ if (sid > 0 && ret_sid != NULL
+ && SCRIPT_ITEM(sid)->sn_state != SN_STATE_NOT_LOADED)
{
// Already loaded and no need to load again, return here.
*ret_sid = sid;
diff --git a/src/version.c b/src/version.c
index adf217566..74b03e47c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4068,
+/**/
4067,
/**/
4066,