diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index a445c31..02bca38 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -4308,8 +4308,9 @@
     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 981bd54..fe55c0a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    859,
+/**/
     858,
 /**/
     857,