From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 21 Aug 2008 13:53:30 +0000 (+0000)
Subject: (x_update_menu_appearance): Check validity of menu font before using
X-Git-Tag: emacs-pretest-23.0.90~3380
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=23888717d0b66d47a151733e81e1787b264cc1fa;p=emacs.git

(x_update_menu_appearance): Check validity of menu font before using
it.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 4e2e36c55b5..bb2f7661504 100644
--- 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 66dcfc157fb..c9abfc84b8d 100644
--- 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))