diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-24 17:18:42 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-24 17:18:42 +0100 |
| commit | 264b74fa545edfb92c0d7d08a02c26331cc5b168 (patch) | |
| tree | 2cd0e8517c498f4ce1442492572032be9815654d /src/window.c | |
| parent | a12a161b8ce09d024ed71c2134149fa323f8ee8e (diff) | |
| download | vim-git-264b74fa545edfb92c0d7d08a02c26331cc5b168.tar.gz | |
patch 8.1.0810: too many #ifdefsv8.1.0810
Problem: Too many #ifdefs.
Solution: Graduate FEAT_MBYTE, part 4.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/window.c b/src/window.c index 792288fbe..58a21e8ca 100644 --- a/src/window.c +++ b/src/window.c @@ -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); |