diff --git a/src/eval.c b/src/eval.c
index 1b2d77e..8250e84 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -17046,13 +17046,16 @@
 	csearch = get_dict_string(d, (char_u *)"char", FALSE);
 	if (csearch != NULL)
 	{
+#ifdef FEAT_MBYTE
 	    if (enc_utf8)
 	    {
 		int pcc[MAX_MCO];
 		int c = utfc_ptr2char(csearch, pcc);
+
 		set_last_csearch(c, csearch, utfc_ptr2len(csearch));
 	    }
 	    else
+#endif
 		set_last_csearch(mb_ptr2char(csearch),
 						csearch, mb_ptr2len(csearch));
 	}
diff --git a/src/version.c b/src/version.c
index c2fd979..da75ff1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    824,
+/**/
     823,
 /**/
     822,