diff --git a/src/eval.c b/src/eval.c
index 8250e84342..fe0a66add3 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -17056,8 +17056,8 @@ f_setcharsearch(argvars, rettv)
 	    }
 	    else
 #endif
-		set_last_csearch(mb_ptr2char(csearch),
-						csearch, mb_ptr2len(csearch));
+		set_last_csearch(PTR2CHAR(csearch),
+						csearch, MB_PTR2LEN(csearch));
 	}
 
 	di = dict_find(d, (char_u *)"forward", -1);
diff --git a/src/search.c b/src/search.c
index de7bae86fc..db6d04c6a7 100644
--- a/src/search.c
+++ b/src/search.c
@@ -451,8 +451,8 @@ last_csearch_until()
     void
 set_last_csearch(c, s, len)
     int		c;
-    char_u	*s;
-    int		len;
+    char_u	*s UNUSED;
+    int		len UNUSED;
 {
     *lastc = c;
 #ifdef FEAT_MBYTE
diff --git a/src/version.c b/src/version.c
index fd9bf1878b..d229752a6e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    826,
 /**/
     825,
 /**/