diff --git a/src/scriptfile.c b/src/scriptfile.c
index bf4cbc0..aebd98d 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -1492,7 +1492,7 @@
     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 ee6be8a..0a98c78 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2125,
+/**/
     2124,
 /**/
     2123,