Mercurial > vim

comparison src/window.c @ 8804:75446578a52f v7.4.1690

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/42356150badca33b4e42dc8172abbceff2e86cbe Author: Bram Moolenaar <Bram@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)
author Christian Brabandt <cb@256bit.org>
date Thu, 31 Mar 2016 22:30:06 +0200
parents 8a106a24d128
children dc10bd23f918
comparison
equal deleted inserted replaced
8803:796eaaa9ef4b 8804:75446578a52f
6744 m->pattern = pat == NULL ? NULL : vim_strsave(pat); 6744 m->pattern = pat == NULL ? NULL : vim_strsave(pat);
6745 m->hlg_id = hlg_id; 6745 m->hlg_id = hlg_id;
6746 m->match.regprog = regprog; 6746 m->match.regprog = regprog;
6747 m->match.rmm_ic = FALSE; 6747 m->match.rmm_ic = FALSE;
6748 m->match.rmm_maxcol = 0; 6748 m->match.rmm_maxcol = 0;
6749 #ifdef FEAT_CONCEAL 6749 # if defined(FEAT_CONCEAL) && defined(FEAT_MBYTE)
6750 m->conceal_char = 0; 6750 m->conceal_char = 0;
6751 if (conceal_char != NULL) 6751 if (conceal_char != NULL)
6752 m->conceal_char = (*mb_ptr2char)(conceal_char); 6752 m->conceal_char = (*mb_ptr2char)(conceal_char);
6753 #endif 6753 # endif
6754 6754
6755 /* Set up position matches */ 6755 /* Set up position matches */
6756 if (pos_list != NULL) 6756 if (pos_list != NULL)
6757 { 6757 {
6758 linenr_T toplnum = 0; 6758 linenr_T toplnum = 0;