# HG changeset patch # User Bram Moolenaar # Date 1403711089 -7200 # Node ID 8dcc6f142460b2d5eee119a174d441d46d95cd99 # Parent c688a2786dd3373fbd790214be83baa76bb62fe3 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 --- 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 --- 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,