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

patch 8.1.0810: too many #ifdefs

Browse Source 
Problem:    Too many #ifdefs.
Solution:   Graduate FEAT_MBYTE, part 4.
This commit is contained in:
Bram Moolenaar
2019-01-24 17:18:42 +01:00
parent a12a161b8c
commit 264b74fa54
25 changed files with 204 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/window.c
View File

@@ -6180,12 +6180,9 @@ file_name_in_line(
*/
while (ptr > line)
{
#ifdef FEAT_MBYTE
if (has_mbyte && (len = (*mb_head_off)(line, ptr - 1)) > 0)
ptr -= len + 1;
else
#endif
if (vim_isfilec(ptr[-1])
else if (vim_isfilec(ptr[-1])
|| ((options & FNAME_HYP) && path_is_url(ptr - 1)))
--ptr;
else
@@ -6214,11 +6211,9 @@ file_name_in_line(
if (ptr[len] == '\\')
/* Skip over the "\" in "\ ". */
++len;
#ifdef FEAT_MBYTE
if (has_mbyte)
len += (*mb_ptr2len)(ptr + len);
else
#endif
++len;
}
@@ -6829,7 +6824,7 @@ match_add(
m->match.regprog = regprog;
m->match.rmm_ic = FALSE;
m->match.rmm_maxcol = 0;
# if defined(FEAT_CONCEAL) && defined(FEAT_MBYTE)
# if defined(FEAT_CONCEAL)
m->conceal_char = 0;
if (conceal_char != NULL)
m->conceal_char = (*mb_ptr2char)(conceal_char);