# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1223506742 0
# Node ID 7e4ece224094981398589385dd0e789791b6fed3
# Parent  1f95f4e947f575f54573269503f0a9becb75e3a5
(fontset_find_font): Check frame validity.

diff -r 1f95f4e947f5 -r 7e4ece224094 src/fontset.c
--- a/src/fontset.c	Wed Oct 08 22:58:55 2008 +0000
+++ b/src/fontset.c	Wed Oct 08 22:59:02 2008 +0000
@@ -516,9 +516,9 @@
      int id, fallback;
 {
   Lisp_Object elt, vec, font_group;
-  int i;
-  FRAME_PTR f = XFRAME (FONTSET_FRAME (fontset));
-  int charset_matched = -1;
+  int i, charset_matched = -1;
+  FRAME_PTR f = (FRAMEP (FONTSET_FRAME (fontset)))
+    ? XFRAME (selected_frame) : XFRAME (FONTSET_FRAME (fontset));
 
   font_group = fontset_get_font_group (fontset, fallback ? -1 : c);
   if (! CONSP (font_group))