diff --git a/src/eval.c b/src/eval.c
index 106f1c5..bc41805 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -21164,6 +21164,9 @@
 	    if (arg[j] != NUL)
 		emsg_funcname((char *)e_invarg2, arg);
 	}
+	/* Disallow using the g: dict. */
+	if (fudi.fd_dict != NULL && fudi.fd_dict->dv_scope == VAR_DEF_SCOPE)
+	    EMSG(_("E862: Cannot use g: here"));
     }
 
     /*
diff --git a/src/version.c b/src/version.c
index ca9b006..fff1f7a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    824,
+/**/
     823,
 /**/
     822,