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

Patch 7.4.1973
Problem:    On MS-Windows the package directory may be added at the end
            because of forward/backward slash differences. (Matthew
            Desjardins)
Solution:   Ignore slash differences.
Files:      src/ex_cmds2.c


*** ../vim-7.4.1972/src/ex_cmds2.c	2016-06-12 21:18:38.203260733 +0200
--- src/ex_cmds2.c	2016-07-01 15:32:59.974117228 +0200
***************
*** 3349,3354 ****
--- 3349,3355 ----
      char_u  *afterdir;
      size_t  afterlen = 0;
      char_u  *ffname = fix_fname(fname);
+     int	    fname_len;
  
      if (ffname == NULL)
  	return;
***************
*** 3369,3375 ****
  	 * find the part up to "pack" in 'runtimepath' */
  	c = *p4;
  	*p4 = NUL;
! 	insp = (char_u *)strstr((char *)p_rtp, (char *)ffname);
  	if (insp == NULL)
  	    /* not found, append at the end */
  	    insp = p_rtp + STRLEN(p_rtp);
--- 3370,3389 ----
  	 * find the part up to "pack" in 'runtimepath' */
  	c = *p4;
  	*p4 = NUL;
! 
! 	/* Find "ffname" in "p_rtp", ignoring '/' vs '\' differences. */
! 	fname_len = STRLEN(ffname);
! 	insp = p_rtp;
! 	for (;;)
! 	{
! 	    if (vim_fnamencmp(insp, ffname, fname_len) == 0)
! 		break;
! 	    insp = vim_strchr(insp, ',');
! 	    if (insp == NULL)
! 		break;
! 	    ++insp;
! 	}
! 
  	if (insp == NULL)
  	    /* not found, append at the end */
  	    insp = p_rtp + STRLEN(p_rtp);
*** ../vim-7.4.1972/src/version.c	2016-07-01 15:03:43.340452729 +0200
--- src/version.c	2016-07-01 15:11:43.205227955 +0200
***************
*** 755,756 ****
--- 755,758 ----
  {   /* Add new patch number below this line */
+ /**/
+     1973,
  /**/

-- 
Living in Hollywood is like living in a bowl of granola.  What ain't
fruits and nuts is flakes.

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