mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-24 20:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.0544: minor issues with setting a string option

Browse Source 
Problem:    Minor issues with setting a string option.
Solution:   Adjust the code, add a test. (closes vim/vim#11192)
fcba86c031
This commit is contained in:
zeertzjq
2022-09-22 21:08:14 +08:00
parent 33f1471472
commit 4371886293
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/option.c
View File

@@ -854,11 +854,9 @@ static int do_set_string(int opt_idx, int opt_flags, char **argp, int nextchar,
// Set 'keywordprg' to ":help" if an empty // Set 'keywordprg' to ":help" if an empty
// value was passed to :set by the user. // value was passed to :set by the user.
// Misuse errbuf[] for the resulting string.
if (varp == (char *)&p_kp && (*arg == NUL || *arg == ' ')) { if (varp == (char *)&p_kp && (*arg == NUL || *arg == ' ')) {
STRCPY(errbuf, ":help");
save_arg = arg; save_arg = arg;
arg = errbuf; arg = ":help";
} else if (varp == (char *)&p_bs && ascii_isdigit(**(char_u **)varp)) { } else if (varp == (char *)&p_bs && ascii_isdigit(**(char_u **)varp)) {
// Convert 'backspace' number to string, for // Convert 'backspace' number to string, for
// adding, prepending and removing string. // adding, prepending and removing string.
@@ -936,7 +934,7 @@ static int do_set_string(int opt_idx, int opt_flags, char **argp, int nextchar,
// are not removed, and keep backslash at start, for "\\machine\path", // are not removed, and keep backslash at start, for "\\machine\path",
// but do remove it for "\\\\machine\\path". // but do remove it for "\\\\machine\\path".
// The reverse is found in ExpandOldSetting(). // The reverse is found in ExpandOldSetting().
while (*arg && !ascii_iswhite(*arg)) { while (*arg != NUL && !ascii_iswhite(*arg)) {
if (*arg == '\\' && arg[1] != NUL if (*arg == '\\' && arg[1] != NUL
#ifdef BACKSLASH_IN_FILENAME #ifdef BACKSLASH_IN_FILENAME
&& !((flags & P_EXPAND) && !((flags & P_EXPAND)
@@ -1062,8 +1060,8 @@ static int do_set_string(int opt_idx, int opt_flags, char **argp, int nextchar,
} }
} }
if (save_arg != NULL) { // number for 'whichwrap' if (save_arg != NULL) {
arg = save_arg; arg = save_arg; // arg was temporarily changed, restore it
} }
} }

14
src/nvim/testdir/test_options.vim
View File

@@ -1209,4 +1209,18 @@ func Test_switchbuf_reset()
only! only!
endfunc endfunc
" :set empty string for global 'keywordprg' falls back to ":help"
func Test_keywordprg_empty()
let k = &keywordprg
set keywordprg=man
call assert_equal('man', &keywordprg)
set keywordprg=
call assert_equal(':help', &keywordprg)
set keywordprg=man
call assert_equal('man', &keywordprg)
call assert_equal("\n keywordprg=:help", execute('set kp= kp?'))
let &keywordprg = k
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab