From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 1 Mar 2024 22:01:43 +0000 (+0100)
Subject: patch 9.1.0146: v:echospace wrong with invalid value of 'showcmdloc'
X-Git-Tag: v9.1.0146^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c27fcf4857228bc650943246ffbba444a085b3e7;p=thirdparty%2Fvim.git

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 <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
---

diff --git a/src/optionstr.c b/src/optionstr.c
index 771423c641..e5f4946b44 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 8d0a422809..46f3368346 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 5842f46d5a..e7ee9466b3 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,
 /**/