8b9a1c
To: vim_dev@googlegroups.com
8b9a1c
Subject: Patch 7.4.029
8b9a1c
Fcc: outbox
8b9a1c
From: Bram Moolenaar <Bram@moolenaar.net>
8b9a1c
Mime-Version: 1.0
8b9a1c
Content-Type: text/plain; charset=UTF-8
8b9a1c
Content-Transfer-Encoding: 8bit
8b9a1c
------------
8b9a1c
8b9a1c
Patch 7.4.029
8b9a1c
Problem:    An error in a pattern is reported twice.
8b9a1c
Solution:   Remove the retry with the backtracking engine, it won't work.
8b9a1c
Files:	    src/regexp.c
8b9a1c
8b9a1c
8b9a1c
*** ../vim-7.4.028/src/regexp.c	2013-08-25 17:01:36.000000000 +0200
8b9a1c
--- src/regexp.c	2013-09-19 17:03:31.000000000 +0200
8b9a1c
***************
8b9a1c
*** 8016,8027 ****
8b9a1c
  	}
8b9a1c
  #endif
8b9a1c
  	/*
8b9a1c
! 	 * If NFA engine failed, then revert to the backtracking engine.
8b9a1c
! 	 * Except when there was a syntax error, which was properly handled by
8b9a1c
! 	 * NFA engine.
8b9a1c
! 	 */
8b9a1c
  	if (regexp_engine == AUTOMATIC_ENGINE)
8b9a1c
  	    prog = bt_regengine.regcomp(expr, re_flags);
8b9a1c
      }
8b9a1c
  
8b9a1c
      return prog;
8b9a1c
--- 8016,8026 ----
8b9a1c
  	}
8b9a1c
  #endif
8b9a1c
  	/*
8b9a1c
! 	 * If the NFA engine failed, the backtracking engine won't work either.
8b9a1c
! 	 *
8b9a1c
  	if (regexp_engine == AUTOMATIC_ENGINE)
8b9a1c
  	    prog = bt_regengine.regcomp(expr, re_flags);
8b9a1c
+ 	 */
8b9a1c
      }
8b9a1c
  
8b9a1c
      return prog;
8b9a1c
*** ../vim-7.4.028/src/version.c	2013-09-19 17:00:14.000000000 +0200
8b9a1c
--- src/version.c	2013-09-19 17:01:13.000000000 +0200
8b9a1c
***************
8b9a1c
*** 740,741 ****
8b9a1c
--- 740,743 ----
8b9a1c
  {   /* Add new patch number below this line */
8b9a1c
+ /**/
8b9a1c
+     29,
8b9a1c
  /**/
8b9a1c
8b9a1c
-- 
8b9a1c
The term "free software" is defined by Richard M. Stallman as
8b9a1c
being software that isn't necessarily for free.  Confusing?
8b9a1c
Let's call it "Stallman software" then!
8b9a1c
				-- Bram Moolenaar
8b9a1c
8b9a1c
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
8b9a1c
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
8b9a1c
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
8b9a1c
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///