mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 14:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0145: v:echospace not correct when 'showcmdloc' != last (#27682)

Browse Source 
Problem:  the amount of available space (v:echospace) on the command
          line is not correct when showcmdloc is drawn into the
          statusline or tabline.
Solution: only add SHOWCMD_COLS to the shown command column when
          'showcmdloc' is set to last (Sam-programs)

closes: vim/vim#14108

062141b1a7

Co-authored-by: Sam-programs <130783534+Sam-programs@users.noreply.github.com>
This commit is contained in:
zeertzjq
2024-03-01 06:13:38 +08:00
committed by GitHub
parent 57e5b9f4ea
commit 5d4e1693cb
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/drawscreen.c
View File

@@ -1178,7 +1178,7 @@ void comp_col(void)
sc_col = ru_col; sc_col = ru_col;
} }
} }
if (p_sc) { if (p_sc && *p_sloc == 'l') {
sc_col += SHOWCMD_COLS; sc_col += SHOWCMD_COLS;
if (!p_ru || last_has_status) { // no need for separating space if (!p_ru || last_has_status) { // no need for separating space
sc_col++; sc_col++;

1
src/nvim/optionstr.c
View File

@@ -2100,6 +2100,7 @@ const char *did_set_showbreak(optset_T *args)
/// The 'showcmdloc' option is changed. /// The 'showcmdloc' option is changed.
const char *did_set_showcmdloc(optset_T *args FUNC_ATTR_UNUSED) const char *did_set_showcmdloc(optset_T *args FUNC_ATTR_UNUSED)
{ {
comp_col();
return did_set_opt_strings(p_sloc, p_sloc_values, true); return did_set_opt_strings(p_sloc, p_sloc_values, true);
} }

6
test/old/testdir/test_messages.vim
View File

@@ -167,8 +167,12 @@ func Test_echospace()
call assert_equal(&columns - 12, v:echospace) call assert_equal(&columns - 12, v:echospace)
set showcmd ruler set showcmd ruler
call assert_equal(&columns - 29, v:echospace) call assert_equal(&columns - 29, v:echospace)
set showcmdloc=statusline
call assert_equal(&columns - 19, v:echospace)
set showcmdloc=tabline
call assert_equal(&columns - 19, v:echospace)
set ruler& showcmd& set ruler& showcmd& showcmdloc&
endfunc endfunc
func Test_warning_scroll() func Test_warning_scroll()