aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.1386: backslash not removed afer space with space in 'isfname'

Browse Source 
Problem:    Backslash not removed afer space in option with space in
            'isfname'.
Solution:   Do remove backslash before space, also when it is in 'isfname'.
            (Yasuhiro Matsumoto, closes #6651)
This commit is contained in:
Bram Moolenaar 2020-08-07 19:12:41 +02:00
parent de6804d871
commit 994b89d28d
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/option.c
View File

@ -1311,12 +1311,12 @@ do_set(
{ {
if (flags & (P_SECURE | P_NO_ML)) if (flags & (P_SECURE | P_NO_ML))
{ {
errmsg = _("E520: Not allowed in a modeline"); errmsg = N_("E520: Not allowed in a modeline");
goto skip; goto skip;
} }
if ((flags & P_MLE) && !p_mle) if ((flags & P_MLE) && !p_mle)
{ {
errmsg = _("E992: Not allowed in a modeline when 'modelineexpr' is off"); errmsg = N_("E992: Not allowed in a modeline when 'modelineexpr' is off");
goto skip; goto skip;
} }
#ifdef FEAT_DIFF #ifdef FEAT_DIFF
@ -1338,7 +1338,7 @@ do_set(
// Disallow changing some options in the sandbox // Disallow changing some options in the sandbox
if (sandbox != 0 && (flags & P_SECURE)) if (sandbox != 0 && (flags & P_SECURE))
{ {
errmsg = _(e_sandbox); errmsg = e_sandbox;
goto skip; goto skip;
} }
#endif #endif
@ -1763,6 +1763,7 @@ do_set(
#ifdef BACKSLASH_IN_FILENAME #ifdef BACKSLASH_IN_FILENAME
&& !((flags & P_EXPAND) && !((flags & P_EXPAND)
&& vim_isfilec(arg[1]) && vim_isfilec(arg[1])
&& !VIM_ISWHITE(arg[1])
&& (arg[1] != '\\' && (arg[1] != '\\'
|| (s == newval || (s == newval
&& arg[2] != '\\'))) && arg[2] != '\\')))

9
src/testdir/test_options.vim
View File

@ -973,4 +973,13 @@ func Test_opt_winminwidth()
set winwidth& set winwidth&
endfunc endfunc
" Test for setting option value containing spaces with isfname+=32
func Test_isfname_with_options()
set isfname+=32
setlocal keywordprg=:term\ help.exe
call assert_equal(':term help.exe', &keywordprg)
set isfname&
setlocal keywordprg&
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1386,
/**/ /**/
1385, 1385,
/**/ /**/