summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2015-08-12 22:56:58 +0200
committerBram Moolenaar <bram@vim.org>2015-08-12 22:56:58 +0200
commit5d41ac5c479235162b3202f0326ad68706ab1336 (patch)
tree2a940f817a2b7212759ac84c14893c602ddf885e
parent5af6f63841513110ad1136364ba43ea500df49a0 (diff)
downloadvim-7.4.824.tar.gz
patch 7.4.824v7.4.824v7-4-824
Problem: Can't compile without the multi-byte feature. (John Marriott) Solution: Add #ifdef.
-rw-r--r--src/eval.c3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index 1b2d77e4..8250e843 100644
--- 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 c2fd979c..da75ff16 100644
--- 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,