Patch 7.4.1690
Problem: Can't compile with the conceal feature but without multi-byte.
Solution: Adjust #ifdef. (Owen Leibman)
Files: src/eval.c, src/window.c
*** ../vim-7.4.1689/src/eval.c 2016-03-29 23:10:14.014448074 +0200
--- src/eval.c 2016-03-31 22:23:35.210589287 +0200
***************
*** 12786,12792 ****
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 (cur->conceal_char)
{
char_u buf[MB_MAXBYTES + 1];
--- 12786,12792 ----
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);
! # if defined(FEAT_CONCEAL) && defined(FEAT_MBYTE)
if (cur->conceal_char)
{
char_u buf[MB_MAXBYTES + 1];
*** ../vim-7.4.1689/src/window.c 2016-03-19 23:07:19.052790870 +0100
--- src/window.c 2016-03-31 22:25:59.489109996 +0200
***************
*** 6746,6756 ****
m->match.regprog = regprog;
m->match.rmm_ic = FALSE;
m->match.rmm_maxcol = 0;
! #ifdef FEAT_CONCEAL
m->conceal_char = 0;
if (conceal_char != NULL)
m->conceal_char = (*mb_ptr2char)(conceal_char);
! #endif
/* Set up position matches */
if (pos_list != NULL)
--- 6746,6756 ----
m->match.regprog = regprog;
m->match.rmm_ic = FALSE;
m->match.rmm_maxcol = 0;
! # if defined(FEAT_CONCEAL) && defined(FEAT_MBYTE)
m->conceal_char = 0;
if (conceal_char != NULL)
m->conceal_char = (*mb_ptr2char)(conceal_char);
! # endif
/* Set up position matches */
if (pos_list != NULL)
*** ../vim-7.4.1689/src/version.c 2016-03-30 22:06:13.223315581 +0200
--- src/version.c 2016-03-31 22:24:24.170088141 +0200
***************
*** 750,751 ****
--- 750,753 ----
{ /* Add new patch number below this line */
+ /**/
+ 1690,
/**/
--
If Microsoft would build a car...
... The airbag system would ask "are you SURE?" before deploying.
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
