diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-31 22:27:40 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-31 22:27:40 +0200 |
| commit | 42356150badca33b4e42dc8172abbceff2e86cbe (patch) | |
| tree | ca62b0037477bd26896097f147a1b49823f93572 | |
| parent | 758535a1df4c5e86b45dddf12db2a54dea28ca40 (diff) | |
| download | vim-git-42356150badca33b4e42dc8172abbceff2e86cbe.tar.gz | |
patch 7.4.1690v7.4.1690
Problem: Can't compile with the conceal feature but without multi-byte.
Solution: Adjust #ifdef. (Owen Leibman)
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/window.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/eval.c b/src/eval.c index 9f6db3123..b2f4462f3 100644 --- a/src/eval.c +++ b/src/eval.c @@ -12786,7 +12786,7 @@ f_getmatches(typval_T *argvars UNUSED, typval_T *rettv UNUSED) 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]; diff --git a/src/version.c b/src/version.c index 8d32e2a0d..3fa82ca88 100644 --- 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, diff --git a/src/window.c b/src/window.c index 9530ef502..c7905aec5 100644 --- 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) |