(x_update_menu_appearance): Check validity of menu font before using

it.

(x_update_menu_appearance): Check validity of menu font before using
it.
23888717 · Chong Yidong · 0a7c6626 · 23888717 · 23888717
Commit 23888717 authored Aug 21, 2008 by Chong Yidong
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

src/ChangeLog src/ChangeLog +3 -0

src/xfaces.c src/xfaces.c +4 -0

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 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>

--- 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))