Mercurial > vim

changeset 6003:8dcc6f142460 v7.4.342

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.342 Problem: Clang gives warnings. Solution: Add an else block. (Dominique Pelle)
author Bram Moolenaar <bram@vim.org>
date Wed, 25 Jun 2014 17:44:49 +0200
parents c688a2786dd3
children cd0a16ae747d
files src/gui_beval.c src/version.c
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    342,
+/**/
     341,
 /**/
     340,