diff options
author | Bram Moolenaar <Bram@vim.org> | 2015-08-12 22:56:58 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2015-08-12 22:56:58 +0200 |
commit | 8e8b486727a473fa21dccde3ec4541f7ee70c2f4 (patch) | |
tree | 8c98bc31aa63331b21eae28fe7c225c02325f42f | |
parent | fc39ecf8ded5466d7e9cbde8db75517718b023d8 (diff) | |
download | vim-git-8e8b486727a473fa21dccde3ec4541f7ee70c2f4.tar.gz |
patch 7.4.824v7.4.824
Problem: Can't compile without the multi-byte feature. (John Marriott)
Solution: Add #ifdef.
-rw-r--r-- | src/eval.c | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index 1b2d77e41..8250e8434 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 c2fd979ca..da75ff162 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, |