To: vim_dev@googlegroups.com
Subject: Patch 8.2.0525
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.0525 (after 8.2.0524)
Problem:    Win32: typo in assignment and misplaced paren.
Solution:   Fix the syntax.
Files:      src/filepath.c


*** ../vim-8.2.0524/src/filepath.c	2020-04-06 22:56:24.815374403 +0200
--- src/filepath.c	2020-04-06 23:48:50.179603316 +0200
***************
*** 3168,3174 ****
  	    break;  // out of memory
  
  	if (*wfb.cAlternateFileName == NUL)
! 	    p_alt == NULL;
  	else
  	    p_alt = utf16_to_enc(wfb.cAlternateFileName, NULL);
  
--- 3168,3174 ----
  	    break;  // out of memory
  
  	if (*wfb.cAlternateFileName == NUL)
! 	    p_alt = NULL;
  	else
  	    p_alt = utf16_to_enc(wfb.cAlternateFileName, NULL);
  
***************
*** 3179,3188 ****
  			     && p[1] != NUL && (p[1] != '.' || p[2] != NUL)))
  		&& (matchname == NULL
  		  || (regmatch.regprog != NULL
! 		     && (vim_regexec(&regmatch, p, (colnr_T)0)
  			 || (p_alt != NULL
! 				 && vim_regexec(&regmatch, p_alt, (colnr_T)0)))
! 		     ))
  		  || ((flags & EW_NOTWILD)
  		     && fnamencmp(path + (s - buf), p, e - s) == 0)))
  	{
--- 3179,3187 ----
  			     && p[1] != NUL && (p[1] != '.' || p[2] != NUL)))
  		&& (matchname == NULL
  		  || (regmatch.regprog != NULL
! 		      && (vim_regexec(&regmatch, p, (colnr_T)0)
  			 || (p_alt != NULL
! 				&& vim_regexec(&regmatch, p_alt, (colnr_T)0))))
  		  || ((flags & EW_NOTWILD)
  		     && fnamencmp(path + (s - buf), p, e - s) == 0)))
  	{
*** ../vim-8.2.0524/src/version.c	2020-04-06 22:56:24.815374403 +0200
--- src/version.c	2020-04-06 23:49:35.215430818 +0200
***************
*** 740,741 ****
--- 740,743 ----
  {   /* Add new patch number below this line */
+ /**/
+     525,
  /**/

-- 
There are only two hard things in programming: Cache invalidation,
naming things and off-by-one errors.

 /// 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    ///