thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1690

Browse Source 
Problem:    Can't compile with the conceal feature but without multi-byte.
Solution:   Adjust #ifdef. (Owen Leibman)
This commit is contained in:
Bram Moolenaar
2016-03-31 22:27:40 +02:00
parent 758535a1df
commit 42356150ba
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/eval.c
View File

@@ -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, "group", 0L, syn_id2name(cur->hlg_id));
dict_add_nr_str(dict, "priority", (long)cur->priority, NULL); dict_add_nr_str(dict, "priority", (long)cur->priority, NULL);
dict_add_nr_str(dict, "id", (long)cur->id, 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) if (cur->conceal_char)
{ {
char_u buf[MB_MAXBYTES + 1]; char_u buf[MB_MAXBYTES + 1];

2
src/version.c
View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1690,
/**/ /**/
1689, 1689,
/**/ /**/

4
src/window.c
View File

@@ -6746,11 +6746,11 @@ match_add(
m->match.regprog = regprog; m->match.regprog = regprog;
m->match.rmm_ic = FALSE; m->match.rmm_ic = FALSE;
m->match.rmm_maxcol = 0; m->match.rmm_maxcol = 0;
#ifdef FEAT_CONCEAL # if defined(FEAT_CONCEAL) && defined(FEAT_MBYTE)
m->conceal_char = 0; m->conceal_char = 0;
if (conceal_char != NULL) if (conceal_char != NULL)
m->conceal_char = (*mb_ptr2char)(conceal_char); m->conceal_char = (*mb_ptr2char)(conceal_char);
#endif # endif
/* Set up position matches */ /* Set up position matches */
if (pos_list != NULL) if (pos_list != NULL)