[Emacs-diffs] master 82052af: Avoid empty menu bar on Xaw with cairo

[YAMAMOTO Mitsuharu]

branch: master
commit 82052afb24d29303804443d160a96c99ce4fae1a
Author: YAMAMOTO Mitsuharu <address@hidden>
Commit: YAMAMOTO Mitsuharu <address@hidden>

    Avoid empty menu bar on Xaw with cairo
    
    * lwlib/lwlib-utils.c (crxft_font_open_name) [USE_CAIRO]: Return NULL if
    font extents are bogus.
---
 lwlib/lwlib-utils.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c
index 2c0a931..1507b08 100644
--- a/lwlib/lwlib-utils.c
+++ b/lwlib/lwlib-utils.c
@@ -192,6 +192,11 @@ crxft_font_open_name (Display *dpy, int screen, const char 
*name)
        }
       FcPatternDestroy (pattern);
     }
+  if (pub && pub->height <= 0)
+    {
+      crxft_font_close (pub);
+      pub = NULL;
+    }
   return pub;
 }