summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/scriptfile.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/scriptfile.c b/src/scriptfile.c
index bf4cbc0ea..aebd98dc7 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -1492,7 +1492,7 @@ almosttheend:
if (si->sn_save_cpo != NULL)
{
set_option_value((char_u *)"cpo", 0L, si->sn_save_cpo, 0);
- si->sn_save_cpo = NULL;
+ CLEAR_POINTER(si->sn_save_cpo);
}
current_sctx = save_current_sctx;
diff --git a/src/version.c b/src/version.c
index ee6be8a76..0a98c78ad 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 */
/**/
+ 2125,
+/**/
2124,
/**/
2123,