From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 25 Jun 2014 15:44:49 +0000 (+0200)
Subject: updated for version 7.4.342
X-Git-Tag: v7.4.342
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db5ffaab5a4755981ee7eff2f044b533ce3042a9;p=vim

updated for version 7.4.342
Problem:    Clang gives warnings.
Solution:   Add an else block. (Dominique Pelle)
---

diff --git a/src/gui_beval.c b/src/gui_beval.c
index fe930f3fa..ae7845660 100644
--- a/src/gui_beval.c
+++ b/src/gui_beval.c
@@ -1193,11 +1193,13 @@ drawBalloon(beval)
 	    XmFontList fl;
 
 	    fl = gui_motif_fontset2fontlist(&gui.tooltip_fontset);
-	    if (fl != NULL)
+	    if (fl == NULL)
 	    {
-		XmStringExtent(fl, s, &w, &h);
-		XmFontListFree(fl);
+		XmStringFree(s);
+		return;
 	    }
+	    XmStringExtent(fl, s, &w, &h);
+	    XmFontListFree(fl);
 	}
 	w += gui.border_offset << 1;
 	h += gui.border_offset << 1;
diff --git a/src/version.c b/src/version.c
index d6c1eb3a0..3fdfae549 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    342,
 /**/
     341,
 /**/