To: vim_dev@googlegroups.com
Subject: Patch 7.4b.005
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.4b.005
Problem:    Finding %s in shellpipe and shellredir does not ignore %%s.
Solution:   Skip over %%. (lcd 47)
Files:	    src/ex_cmds.c


*** ../vim-7.4b.004/src/ex_cmds.c	2013-07-28 13:34:50.000000000 +0200
--- src/ex_cmds.c	2013-08-02 14:03:00.000000000 +0200
***************
*** 1622,1631 ****
      char_u	*end;
  
      end = buf + STRLEN(buf);
!     /* find "%s", skipping "%%" */
      for (p = opt; (p = vim_strchr(p, '%')) != NULL; ++p)
! 	if (p[1] == 's')
  	    break;
      if (p != NULL)
      {
  	*end = ' '; /* not really needed? Not with sh, ksh or bash */
--- 1622,1635 ----
      char_u	*end;
  
      end = buf + STRLEN(buf);
!     /* find "%s" */
      for (p = opt; (p = vim_strchr(p, '%')) != NULL; ++p)
!     {
! 	if (p[1] == 's') /* found %s */
  	    break;
+ 	if (p[1] == '%') /* skip %% */
+ 	    ++p;
+     }
      if (p != NULL)
      {
  	*end = ' '; /* not really needed? Not with sh, ksh or bash */
*** ../vim-7.4b.004/src/version.c	2013-08-01 18:38:23.000000000 +0200
--- src/version.c	2013-08-02 14:04:43.000000000 +0200
***************
*** 729,730 ****
--- 729,732 ----
  {   /* Add new patch number below this line */
+ /**/
+     5,
  /**/

-- 
Change is inevitable, except from a vending machine.

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