diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-10-31 20:24:24 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-11-27 01:14:55 +0100 |
| commit | 60f845ca55a1b8b11a4eb390b1fed93a79e99ad5 (patch) | |
| tree | 011aab33314cde1e96a07b7453606e457c431c5f /src/nvim/screen.c | |
| parent | 3283db4ecbe32c6f2bbf1c7ea3032ef4091d5444 (diff) | |
| download | rneovim-60f845ca55a1b8b11a4eb390b1fed93a79e99ad5.tar.gz rneovim-60f845ca55a1b8b11a4eb390b1fed93a79e99ad5.tar.bz2 rneovim-60f845ca55a1b8b11a4eb390b1fed93a79e99ad5.zip | |
diff/highlight: Show underline for low-priority CursorLine
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 2a1dae1767..eb24e2af1c 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -3052,9 +3052,13 @@ win_line ( diff_hlf = HLF_CHD; // changed line } line_attr = win_hl_attr(wp, diff_hlf); - // Overlay CursorLine onto diff highlight, unless it's low-priority. - if (!line_attr_lowprio && wp->w_p_cul && lnum == wp->w_cursor.lnum) { - line_attr = hl_combine_attr(line_attr, win_hl_attr(wp, HLF_CUL)); + // Overlay CursorLine onto diff-mode highlight. + if (wp->w_p_cul && lnum == wp->w_cursor.lnum) { + line_attr = 0 != line_attr_lowprio // Low-priority CursorLine + ? hl_combine_attr(hl_combine_attr(win_hl_attr(wp, HLF_CUL), + line_attr), + hl_get_underline()) + : hl_combine_attr(line_attr, win_hl_attr(wp, HLF_CUL)); } } |