patch 7.4.824

Problem:    Can't compile without the multi-byte feature. (John Marriott)
Solution:   Add #ifdef.

diff --git a/src/eval.c b/src/eval.c
index 1b2d77e41bba0e0ecc43a3d985cee56656a1114d..8250e84342077c3afe66e92077ca6fa391cfd744 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -17046,13 +17046,16 @@ f_setcharsearch(argvars, rettv)
        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 c2fd979cadd5ed84f7242c1c3bcab5ee0c2f5c83..da75ff162aefd9e3698b7fab1ccdede0a3343bfc 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 */
+/**/
+    824,
 /**/
     823,
 /**/