diff options
| author | tj-moody <92702993+tj-moody@users.noreply.github.com> | 2023-09-23 22:49:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-24 10:49:47 +0800 |
| commit | 046c9a83f7ed2694c19d915a63ef0dfed9d29dc5 (patch) | |
| tree | 91959929052c4b4922095954678220e3480f6dcd /src | |
| parent | cfb898cd8a42ff2262c96a12919a3cacef9d2973 (diff) | |
| download | rneovim-046c9a83f7ed2694c19d915a63ef0dfed9d29dc5.tar.gz rneovim-046c9a83f7ed2694c19d915a63ef0dfed9d29dc5.tar.bz2 rneovim-046c9a83f7ed2694c19d915a63ef0dfed9d29dc5.zip | |
fix(ui): always use stl/stlnc fillchars when drawing statusline (#25267)
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/options.lua | 8 | ||||
| -rw-r--r-- | src/nvim/statusline.c | 13 |
2 files changed, 4 insertions, 17 deletions
diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 5fd7e86993..258145e85e 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -2790,8 +2790,8 @@ return { and the value of that item: item default Used for ~ - stl ' ' or '^' statusline of the current window - stlnc ' ' or '=' statusline of the non-current windows + stl ' ' statusline of the current window + stlnc ' ' statusline of the non-current windows wbr ' ' window bar horiz '─' or '-' horizontal separators |:split| horizup '┴' or '-' upwards facing horizontal separator @@ -2810,9 +2810,7 @@ return { eob '~' empty lines at the end of a buffer lastline '@' 'display' contains lastline/truncate - Any one that is omitted will fall back to the default. For "stl" and - "stlnc" the space will be used when there is highlighting, '^' or '=' - otherwise. + Any one that is omitted will fall back to the default. Note that "horiz", "horizup", "horizdown", "vertleft", "vertright" and "verthoriz" are only used when 'laststatus' is 3, since only vertical diff --git a/src/nvim/statusline.c b/src/nvim/statusline.c index a6f1da8761..4d318f8c59 100644 --- a/src/nvim/statusline.c +++ b/src/nvim/statusline.c @@ -637,18 +637,7 @@ int fillchar_status(int *attr, win_T *wp) *attr = win_hl_attr(wp, HLF_SNC); fill = wp->w_p_fcs_chars.stlnc; } - // Use fill when there is highlighting, and highlighting of current - // window differs, or the fillchars differ, or this is not the - // current window - if (*attr != 0 && ((win_hl_attr(wp, HLF_S) != win_hl_attr(wp, HLF_SNC) - || !is_curwin || ONE_WINDOW) - || (wp->w_p_fcs_chars.stl != wp->w_p_fcs_chars.stlnc))) { - return fill; - } - if (is_curwin) { - return '^'; - } - return '='; + return fill; } /// Redraw the status line according to 'statusline' and take care of any |