diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index a445c3135c..02bca38e04 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -4308,8 +4308,9 @@ get_address(
     lnum = MAXLNUM;
     do
     {
+#ifdef FEAT_FOLDING
 	int base_char = *cmd;
-
+#endif
 	switch (*cmd)
 	{
 	    case '.':			    // '.' - Cursor position
diff --git a/src/version.c b/src/version.c
index 981bd548a8..fe55c0a1ab 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    859,
 /**/
     858,
 /**/