From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 13 Jul 2013 18:58:11 +0000 (+0200)
Subject: updated for version 7.4a.018
X-Git-Tag: v7.4a.018
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=690ae9c85854433d9b3d4ce76eb5d99340c56b2a;p=vim

updated for version 7.4a.018
Problem:    Compiler warning for code unreachable. (Charles Campbell)
Solution:   Use "while" instead of endless loop.  Change break to continue.
---

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index d8df13cb0..b16ba56ea 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -3739,7 +3739,7 @@ match_follows(startstate, depth)
     if (depth > 10)
 	return FALSE;
 
-    for (;;)
+    while (state != NULL)
     {
 	switch (state->c)
 	{
@@ -3765,7 +3765,7 @@ match_follows(startstate, depth)
 	    case NFA_COMPOSING:
 		/* skip ahead to next state */
 		state = state->out1->out;
-		break;
+		continue;
 
 	    case NFA_ANY:
 	    case NFA_IDENT:
diff --git a/src/ui.c b/src/ui.c
index 577b74230..18021c21e 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1467,8 +1467,9 @@ clip_gen_owner_exists(cbd)
     else
 # endif
 	return clip_x11_owner_exists(cbd);
-#endif
+#else
     return TRUE;
+#endif
 }
 
 #endif /* FEAT_CLIPBOARD */
diff --git a/src/version.c b/src/version.c
index 67230f5da..1744af415 100644
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    18,
 /**/
     17,
 /**/