patch 7.4.1690

Problem:    Can't compile with the conceal feature but without multi-byte.
Solution:   Adjust #ifdef. (Owen Leibman)

diff --git a/src/eval.c b/src/eval.c
index 9f6db3123b7dd29458ef84777c8646742ce93334..b2f4462f3fa920b25a138e57b58b3056c54eda0a 100644 (file)
--- 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 8d32e2a0d3a2d3144da7952f30f85c18c385632d..3fa82ca88627e6a2c8df10db299100fcee276eeb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1690,
 /**/
     1689,
 /**/

diff --git a/src/window.c b/src/window.c
index 9530ef5020effe25290f02cf6aea3a22ad589c7b..c7905aec57aa825ae1a7145eaa43f0a09eb70fb7 100644 (file)
--- 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)