From c27fcf4857228bc650943246ffbba444a085b3e7 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 1 Mar 2024 23:01:43 +0100 Subject: [PATCH] patch 9.1.0146: v:echospace wrong with invalid value of 'showcmdloc' Problem: v:echospace wrong after setting invalid value to 'showcmdloc'. Solution: Only call comp_col() if value is valid. (zeertzjq) closes: #14119 Signed-off-by: zeertzjq Signed-off-by: Christian Brabandt --- src/optionstr.c | 8 ++++++-- src/testdir/test_messages.vim | 6 ++++++ src/version.c | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/optionstr.c b/src/optionstr.c index 771423c64..e5f4946b4 100644 --- a/src/optionstr.c +++ b/src/optionstr.c @@ -3440,8 +3440,12 @@ did_set_showbreak(optset_T *args) char * did_set_showcmdloc(optset_T *args UNUSED) { - comp_col(); - return did_set_opt_strings(p_sloc, p_sloc_values, FALSE); + char *errmsg = did_set_opt_strings(p_sloc, p_sloc_values, FALSE); + + if (errmsg == NULL) + comp_col(); + + return errmsg; } int diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim index 8d0a42280..46f336834 100644 --- a/src/testdir/test_messages.vim +++ b/src/testdir/test_messages.vim @@ -166,6 +166,12 @@ func Test_echospace() call assert_equal(&columns - 19, v:echospace) set showcmdloc=tabline call assert_equal(&columns - 19, v:echospace) + call assert_fails('set showcmdloc=leap', 'E474:') + call assert_equal(&columns - 19, v:echospace) + set showcmdloc=last + call assert_equal(&columns - 29, v:echospace) + call assert_fails('set showcmdloc=jump', 'E474:') + call assert_equal(&columns - 29, v:echospace) set ruler& showcmd& showcmdloc& endfunc diff --git a/src/version.c b/src/version.c index 5842f46d5..e7ee9466b 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 146, /**/ 145, /**/