diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-03-01 23:01:43 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-03-01 23:03:16 +0100 |
| commit | c27fcf4857228bc650943246ffbba444a085b3e7 (patch) | |
| tree | f8ce623823843474e1f489e857a4b38a2312d5cc | |
| parent | 87410ab3f556121dfb3b30515f40c5f079edd004 (diff) | |
patch 9.1.0146: v:echospace wrong with invalid value of 'showcmdloc'v9.1.0146
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>
| -rw-r--r-- | src/optionstr.c | 8 | ||||
| -rw-r--r-- | src/testdir/test_messages.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 2 deletions
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 @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 146, +/**/ 145, /**/ 144, |