(x_update_menu_appearance): Check validity of menu font before using

it.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4e2e36c55b57962e35f93c23a450cbb297837361..bb2f7661504f1c953b7d9ef07b6d8d26fdc35734 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2008-08-21  Chong Yidong  <cyd@stupidchicken.com>
 
+       * xfaces.c (x_update_menu_appearance): Check validity of menu font
+       before using it.
+
        * puresize.h (BASE_PURESIZE): Increase to 1250000.
 
 2008-08-20  Adrian Robert  <Adrian.B.Robert@gmail.com>

diff --git a/src/xfaces.c b/src/xfaces.c
index 66dcfc157fb1fee5444eb98d0fb8a1e22e24b8b7..c9abfc84b8d41fda9dcef6bbbef4948983bbc527 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3733,6 +3733,10 @@ x_update_menu_appearance (f)
        }
 
       if (face->font
+         /* On Solaris 5.8, it's been reported that the `menu' face
+            can be unspecified here, during startup.  Why this
+            happens remains unknown.  -- cyd  */
+         && FONTP (LFACE_FONT (lface))
          && (!UNSPECIFIEDP (LFACE_FAMILY (lface))
              || !UNSPECIFIEDP (LFACE_FOUNDRY (lface))
              || !UNSPECIFIEDP (LFACE_SWIDTH (lface))