Mercurial > emacs

changeset 97599:9806866dbf50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_update_menu_appearance): Check validity of menu font before using it.
author Chong Yidong <cyd@stupidchicken.com>
date Thu, 21 Aug 2008 13:53:30 +0000
parents 4e53ad6f16b6
children 701d5add5730
files src/ChangeLog src/xfaces.c
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Aug 21 13:47:37 2008 +0000
+++ b/src/ChangeLog	Thu Aug 21 13:53:30 2008 +0000
@@ -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>
--- a/src/xfaces.c	Thu Aug 21 13:47:37 2008 +0000
+++ b/src/xfaces.c	Thu Aug 21 13:53:30 2008 +0000
@@ -3733,6 +3733,10 @@
 	}
 
       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))