neovim

commit 5d4e1693cb415e8b76749e833e28f00f14630b87
parent 57e5b9f4eadfda3dbcf94d8ea7e37ac61d157d9d
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Fri,  1 Mar 2024 06:13:38 +0800

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

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

https://github.com/vim/vim/commit/062141b1a70cf5364e6983ec901282e0111745c1

Co-authored-by: Sam-programs <130783534+Sam-programs@users.noreply.github.com>
Diffstat:
M
src/nvim/drawscreen.c
 | 
2
+-
M
src/nvim/optionstr.c
 | 
1
+
M
test/old/testdir/test_messages.vim
 | 
6
+++++-

3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c
@@ -1178,7 +1178,7 @@ void comp_col(void)
       sc_col = ru_col;
     }
   }
-  if (p_sc) {
+  if (p_sc && *p_sloc == 'l') {
     sc_col += SHOWCMD_COLS;
     if (!p_ru || last_has_status) {         // no need for separating space
       sc_col++;
diff --git a/src/nvim/optionstr.c b/src/nvim/optionstr.c
@@ -2100,6 +2100,7 @@ const char *did_set_showbreak(optset_T *args)
 /// The 'showcmdloc' option is changed.
 const char *did_set_showcmdloc(optset_T *args FUNC_ATTR_UNUSED)
 {
+  comp_col();
   return did_set_opt_strings(p_sloc, p_sloc_values, true);
 }
 
diff --git a/test/old/testdir/test_messages.vim b/test/old/testdir/test_messages.vim
@@ -167,8 +167,12 @@ func Test_echospace()
   call assert_equal(&columns - 12, v:echospace)
   set showcmd ruler
   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
 
 func Test_warning_scroll()