[vim] 01/139: patch 7.4.1690 Problem: Can't compile with the conceal feature but without multi-byte. Solution: Adjust #ifdef. (Owen Leibman)
James McCoy
jamessan at debian.org
Fri May 6 03:59:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch debian/sid
in repository vim.
commit 42356150badca33b4e42dc8172abbceff2e86cbe
Author: Bram Moolenaar <Bram at 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)
---
src/eval.c | 2 +-
src/version.c | 2 ++
src/window.c | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/eval.c b/src/eval.c
index 9f6db31..b2f4462 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 8d32e2a..3fa82ca 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 9530ef5..c7905ae 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)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git
More information about the pkg-vim-maintainers
mailing list