Mercurial > vim

changeset 7014:962b3ae252a9 v7.4.824

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 7.4.824 Problem: Can't compile without the multi-byte feature. (John Marriott) Solution: Add #ifdef.
author Bram Moolenaar <bram@vim.org>
date Wed, 12 Aug 2015 22:56:58 +0200
parents 349e6c01f35d
children a9290d3ec4ed
files src/eval.c src/version.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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));
 	}
--- 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 */
 /**/
+    824,
+/**/
     823,
 /**/
     822,