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
index 8250e84342077c3afe66e92077ca6fa391cfd744..fe0a66add3f64b9f7ceaf83ff895d352747a443c 100644 (file)
--- 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 de7bae86fc88bde57a3d9a33adaae97125100e35..db6d04c6a7d2a7535f1d3ff3a4427bf03d23549b 100644 (file)
--- 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 fd9bf1878bdf2731321e07c091c6f8b03aa8b8c4..d229752a6e818b56cb29dceea6e92d01023f8901 100644 (file)
--- 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,
 /**/