To: vim_dev@googlegroups.com
Subject: Patch 8.2.1386
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.1386
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)
Files:      src/option.c, src/testdir/test_options.vim


*** ../vim-8.2.1385/src/option.c	2020-06-10 21:46:56.387670023 +0200
--- src/option.c	2020-08-07 19:06:16.594196017 +0200
***************
*** 1311,1322 ****
  	    {
  		if (flags & (P_SECURE | P_NO_ML))
  		{
! 		    errmsg = _("E520: Not allowed in a modeline");
  		    goto skip;
  		}
  		if ((flags & P_MLE) && !p_mle)
  		{
! 		    errmsg = _("E992: Not allowed in a modeline when 'modelineexpr' is off");
  		    goto skip;
  		}
  #ifdef FEAT_DIFF
--- 1311,1322 ----
  	    {
  		if (flags & (P_SECURE | P_NO_ML))
  		{
! 		    errmsg = N_("E520: Not allowed in a modeline");
  		    goto skip;
  		}
  		if ((flags & P_MLE) && !p_mle)
  		{
! 		    errmsg = N_("E992: Not allowed in a modeline when 'modelineexpr' is off");
  		    goto skip;
  		}
  #ifdef FEAT_DIFF
***************
*** 1338,1344 ****
  	    // Disallow changing some options in the sandbox
  	    if (sandbox != 0 && (flags & P_SECURE))
  	    {
! 		errmsg = _(e_sandbox);
  		goto skip;
  	    }
  #endif
--- 1338,1344 ----
  	    // Disallow changing some options in the sandbox
  	    if (sandbox != 0 && (flags & P_SECURE))
  	    {
! 		errmsg = e_sandbox;
  		goto skip;
  	    }
  #endif
***************
*** 1763,1768 ****
--- 1763,1769 ----
  #ifdef BACKSLASH_IN_FILENAME
  					&& !((flags & P_EXPAND)
  						&& vim_isfilec(arg[1])
+ 						&& !VIM_ISWHITE(arg[1])
  						&& (arg[1] != '\\'
  						    || (s == newval
  							&& arg[2] != '\\')))
*** ../vim-8.2.1385/src/testdir/test_options.vim	2020-06-26 20:41:35.628844696 +0200
--- src/testdir/test_options.vim	2020-08-07 19:07:30.473880105 +0200
***************
*** 973,976 ****
--- 973,985 ----
    set winwidth&
  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-8.2.1385/src/version.c	2020-08-07 18:33:15.731004100 +0200
--- src/version.c	2020-08-07 19:08:29.145630152 +0200
***************
*** 756,757 ****
--- 756,759 ----
  {   /* Add new patch number below this line */
+ /**/
+     1386,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
142. You dream about creating the world's greatest web site.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///