jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone
073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.554
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.554
073263
Problem:    Missing part of patch 7.4.519.
073263
Solution:   Copy back regprog after calling vim_regexec.
073263
Files:	    src/quickfix.c
073263
073263
073263
*** ../vim-7.4.553/src/quickfix.c	2014-07-23 16:33:04.075886500 +0200
073263
--- src/quickfix.c	2014-11-19 16:21:16.404128731 +0100
073263
***************
073263
*** 592,597 ****
073263
--- 592,599 ----
073263
  restofline:
073263
  	for ( ; fmt_ptr != NULL; fmt_ptr = fmt_ptr->next)
073263
  	{
073263
+ 	    int r;
073263
+ 
073263
  	    idx = fmt_ptr->prefix;
073263
  	    if (multiscan && vim_strchr((char_u *)"OPQ", idx) == NULL)
073263
  		continue;
073263
***************
073263
*** 607,613 ****
073263
  	    tail = NULL;
073263
  
073263
  	    regmatch.regprog = fmt_ptr->prog;
073263
! 	    if (vim_regexec(&regmatch, IObuff, (colnr_T)0))
073263
  	    {
073263
  		if ((idx == 'C' || idx == 'Z') && !multiline)
073263
  		    continue;
073263
--- 609,617 ----
073263
  	    tail = NULL;
073263
  
073263
  	    regmatch.regprog = fmt_ptr->prog;
073263
! 	    r = vim_regexec(&regmatch, IObuff, (colnr_T)0);
073263
! 	    fmt_ptr->prog = regmatch.regprog;
073263
! 	    if (r)
073263
  	    {
073263
  		if ((idx == 'C' || idx == 'Z') && !multiline)
073263
  		    continue;
073263
*** ../vim-7.4.553/src/version.c	2014-12-17 14:36:10.367090935 +0100
073263
--- src/version.c	2014-12-17 14:40:51.463618087 +0100
073263
***************
073263
*** 743,744 ****
073263
--- 743,746 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     554,
073263
  /**/
073263
073263
-- 
073263
hundred-and-one symptoms of being an internet addict:
073263
2. You kiss your girlfriend's home page.
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///