diff --git a/src/buffer.c b/src/buffer.c
index f76d849..64ba5ab 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4229,7 +4229,7 @@
 
 #ifdef FEAT_EVAL
 	    vim_snprintf((char *)tmp, sizeof(tmp), "%d", curbuf->b_fnum);
-	    set_internal_string_var((char_u *)"actual_curbuf", tmp);
+	    set_internal_string_var((char_u *)"g:actual_curbuf", tmp);
 
 	    save_curbuf = curbuf;
 	    save_curwin = curwin;
diff --git a/src/version.c b/src/version.c
index bd8da20..c3b7add 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    240,
+/**/
     239,
 /**/
     238,