0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 8.2.2485: when sourcing a script again the script version isn't reset

Problem:    When sourcing a script again the script version isn't reset.
Solution:   Set sn_version to one when sourcing a script again. Clear
            sn_save_cpo properly. (closes #7608)
This commit is contained in:
Bram Moolenaar
2021-02-07 17:17:58 +01:00
parent dee37dc733
commit 0123cc1e14
3 changed files with 20 additions and 2 deletions

View File

@@ -1319,6 +1319,9 @@ do_source(
}
// imports can be redefined once
mark_imports_for_reload(sid);
// reset version, "vim9script" may have been added or removed.
si->sn_version = 1;
}
else
{
@@ -1457,7 +1460,7 @@ almosttheend:
if (si->sn_save_cpo != NULL)
{
set_option_value((char_u *)"cpo", 0L, si->sn_save_cpo, 0);
CLEAR_POINTER(si->sn_save_cpo);
VIM_CLEAR(si->sn_save_cpo);
}
restore_funccal();