From a50d02d98350a5d876ff0521ad87f3930cf63b5c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 16 Jun 2013 15:43:50 +0200
Subject: [PATCH] updated for version 7.3.1207 Problem:    New regexp engine:
 no match found on "#if FOO". (Lech Lorens) Solution:   When adding a state
 gets skipped don't adjust the index.

---
 src/regexp_nfa.c      | 2 ++
 src/testdir/test64.in | 2 ++
 src/testdir/test64.ok | 3 +++
 src/version.c         | 2 ++
 4 files changed, 9 insertions(+)

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 5414465b5..47d7030e5 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -4210,6 +4210,8 @@ addstate_here(l, state, subs, pim, ip)
 
     /* re-order to put the new state at the current position */
     count = l->n - tlen;
+    if (count == 0)
+	return; /* no state got added */
     if (count == 1)
     {
 	/* overwrite the current state */
diff --git a/src/testdir/test64.in b/src/testdir/test64.in
index ad11c3c49..0cabcdfc0 100644
--- a/src/testdir/test64.in
+++ b/src/testdir/test64.in
@@ -408,6 +408,8 @@ STARTTEST
 :"""" Requiring lots of states.
 :call add(tl, [2, '[0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12}', " 12345678-1234-1234-1234-123456789012 ", "12345678-1234-1234-1234-123456789012", "1234-"])
 :"
+:"""" Skip adding state twice
+:call add(tl, [2, '^\%(\%(^\s*#\s*if\>\|#\s*if\)\)\(\%>1c.*$\)\@=', "#if FOO", "#if", ' FOO'])
 :"
 :"""" Run the tests
 :"
diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok
index 48694fb51..fda589223 100644
--- a/src/testdir/test64.ok
+++ b/src/testdir/test64.ok
@@ -913,6 +913,9 @@ OK 2 - \_[^a]\+
 OK 0 - [0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12}
 OK 1 - [0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12}
 OK 2 - [0-9a-zA-Z]\{8}-\([0-9a-zA-Z]\{4}-\)\{3}[0-9a-zA-Z]\{12}
+OK 0 - ^\%(\%(^\s*#\s*if\>\|#\s*if\)\)\(\%>1c.*$\)\@=
+OK 1 - ^\%(\%(^\s*#\s*if\>\|#\s*if\)\)\(\%>1c.*$\)\@=
+OK 2 - ^\%(\%(^\s*#\s*if\>\|#\s*if\)\)\(\%>1c.*$\)\@=
 multi-line tests
 OK 0 - ^.\(.\).\_..\1.
 OK 1 - ^.\(.\).\_..\1.
diff --git a/src/version.c b/src/version.c
index 85147e818..3374e16f5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1207,
 /**/
     1206,
 /**/
-- 
2.50.1