Mercurial > vim

comparison src/optionstr.c @ 34464:9702c63dd040 v9.1.0146

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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>
author Christian Brabandt <cb@256bit.org>
date Fri, 01 Mar 2024 23:15:08 +0100
parents 321281d8b353
children 159d598e6781
comparison
equal deleted inserted replaced
34463:4944acf6b46f 34464:9702c63dd040
3438 * The 'showcmdloc' option is changed. 3438 * The 'showcmdloc' option is changed.
3439 */ 3439 */
3440 char * 3440 char *
3441 did_set_showcmdloc(optset_T *args UNUSED) 3441 did_set_showcmdloc(optset_T *args UNUSED)
3442 { 3442 {
3443 comp_col(); 3443 char *errmsg = did_set_opt_strings(p_sloc, p_sloc_values, FALSE);
3444 return did_set_opt_strings(p_sloc, p_sloc_values, FALSE); 3444
3445 if (errmsg == NULL)
3446 comp_col();
3447
3448 return errmsg;
3445 } 3449 }
3446 3450
3447 int 3451 int
3448 expand_set_showcmdloc(optexpand_T *args, int *numMatches, char_u ***matches) 3452 expand_set_showcmdloc(optexpand_T *args, int *numMatches, char_u ***matches)
3449 { 3453 {