diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-03-31 20:58:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-31 20:58:36 +0200 |
| commit | f793c578bc409be65b755c35d347b8c60f777eed (patch) | |
| tree | de788d46cd03138f759f31f26cdc4b7130226263 /src/nvim/screen.c | |
| parent | 157034bd6ce48e7138171627713672ccdea730aa (diff) | |
| parent | 13f4d4fb6e10ca59a93b1e7ebb56215891b80c2e (diff) | |
| download | rneovim-f793c578bc409be65b755c35d347b8c60f777eed.tar.gz rneovim-f793c578bc409be65b755c35d347b8c60f777eed.tar.bz2 rneovim-f793c578bc409be65b755c35d347b8c60f777eed.zip | |
Merge #9822 from janlazo/vim-8.1.1073
vim-patch:8.1.{1073,1074,1082,1087}
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index edddfd8ed3..e66425d0c1 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -2772,8 +2772,15 @@ win_line ( if (wp->w_skipcol > 0) for (p_extra = extra; *p_extra == ' '; ++p_extra) *p_extra = '-'; - if (wp->w_p_rl) /* reverse line numbers */ - rl_mirror(extra); + if (wp->w_p_rl) { // reverse line numbers + // like rl_mirror(), but keep the space at the end + char_u *p2 = skiptowhite(extra) - 1; + for (char_u *p1 = extra; p1 < p2; p1++, p2--) { + const int t = *p1; + *p1 = *p2; + *p2 = t; + } + } p_extra = extra; c_extra = NUL; c_final = NUL; @@ -2956,8 +2963,11 @@ win_line ( shl->endcol = tmp_col; } shl->attr_cur = shl->attr; - if (cur != NULL && syn_name2id((char_u *)"Conceal") - == cur->hlg_id) { + // Match with the "Conceal" group results in hiding + // the match. + if (cur != NULL + && shl != &search_hl + && syn_name2id((char_u *)"Conceal") == cur->hlg_id) { has_match_conc = v == (long)shl->startcol ? 2 : 1; match_conc = cur->conceal_char; } else { |