# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1439501323 -7200
# Node ID db0328a2fa2a67e43cd7eeca0f95d1b96bcd6bbb
# Parent  d4e2b982184395b5af3e06830f64e73c930c7e91
patch 7.4.826
Problem:    Compiler warnings and errors.
Solution:   Make it build properly without the multi-byte feature.

diff --git a/src/eval.c b/src/eval.c
--- 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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    826,
+/**/
     825,
 /**/
     824,