Mercurial > vim
changeset 8804:75446578a52f v7.4.1690
commit https://github.com/vim/vim/commit/42356150badca33b4e42dc8172abbceff2e86cbe
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Mar 31 22:27:40 2016 +0200
patch 7.4.1690
Problem: Can't compile with the conceal feature but without multi-byte.
Solution: Adjust #ifdef. (Owen Leibman)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 31 Mar 2016 22:30:06 +0200 |
| parents | 796eaaa9ef4b |
| children | 6d8b4fe96454 |
| files | src/eval.c src/version.c src/window.c |
| diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -12786,7 +12786,7 @@ f_getmatches(typval_T *argvars UNUSED, t dict_add_nr_str(dict, "group", 0L, syn_id2name(cur->hlg_id)); dict_add_nr_str(dict, "priority", (long)cur->priority, NULL); dict_add_nr_str(dict, "id", (long)cur->id, NULL); -# ifdef FEAT_CONCEAL +# if defined(FEAT_CONCEAL) && defined(FEAT_MBYTE) if (cur->conceal_char) { char_u buf[MB_MAXBYTES + 1];
--- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1690, +/**/ 1689, /**/ 1688,
--- a/src/window.c +++ b/src/window.c @@ -6746,11 +6746,11 @@ match_add( m->match.regprog = regprog; m->match.rmm_ic = FALSE; m->match.rmm_maxcol = 0; -#ifdef FEAT_CONCEAL +# if defined(FEAT_CONCEAL) && defined(FEAT_MBYTE) m->conceal_char = 0; if (conceal_char != NULL) m->conceal_char = (*mb_ptr2char)(conceal_char); -#endif +# endif /* Set up position matches */ if (pos_list != NULL)