diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-06-25 17:44:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-06-25 17:44:49 +0200 |
| commit | db5ffaab5a4755981ee7eff2f044b533ce3042a9 (patch) | |
| tree | d50119b7434e42e22e5787fec920a32876c7095a /src | |
| parent | e8a3492548468c9d055adeb9f8d352e2c4482b19 (diff) | |
updated for version 7.4.342v7.4.342
Problem: Clang gives warnings.
Solution: Add an else block. (Dominique Pelle)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui_beval.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gui_beval.c b/src/gui_beval.c index fe930f3faf..ae78456607 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 d6c1eb3a00..3fdfae5497 100644 --- 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, |