# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1709331308 -3600
# Node ID 9702c63dd040b5cb379d15d1bf925711100f5074
# Parent  4944acf6b46f4d2e912de9274c9f059a03dee806
patch 9.1.0146: v:echospace wrong with invalid value of 'showcmdloc'

Commit: https://github.com/vim/vim/commit/c27fcf4857228bc650943246ffbba444a085b3e7
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Fri Mar 1 23:01:43 2024 +0100

    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
--- 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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    146,
+/**/
     145,
 /**/
     144,