From 690ae9c85854433d9b3d4ce76eb5d99340c56b2a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 13 Jul 2013 20:58:11 +0200
Subject: 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.

---
 src/regexp_nfa.c | 4 ++--
 src/ui.c         | 3 ++-
 src/version.c    | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index d8df13cb07..b16ba56ea6 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 577b74230a..18021c21ed 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 67230f5dad..1744af4158 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,
 /**/
-- 
cgit v1.2.3