diff src/faces.c @ 3676:3ef0aaf3dc34

[xemacs-hg @ 2006-11-12 13:40:04 by aidan] Prevent a crash if the ASCII charset registries match nothing.
author aidan
date Sun, 12 Nov 2006 13:40:09 +0000
parents 98af8a976fc3
children f6f6fc9eb269
line wrap: on
line diff
--- a/src/faces.c	Sat Nov 11 22:51:05 2006 +0000
+++ b/src/faces.c	Sun Nov 12 13:40:09 2006 +0000
@@ -1162,7 +1162,7 @@
     /* Lookup the face again, this time allowing the fallback. If this
        succeeds, it'll give a font intended for the script in question,
        which is preferable to translating to ISO10646-1 and using the
-       fixed-with fallback.  */
+       fixed-width fallback.  */
     new_val = face_property_matching_instance (face, Qfont,
 					       charset, domain,
 					       ERROR_ME_DEBUG_WARN, 0,
@@ -1841,6 +1841,9 @@
 {
   struct frame *frm = XFRAME (frame);
 
+  if (!FRAME_LIVE_P(frm))
+    return;
+
   if (EQ (name, Qfont))
     MARK_FRAME_SIZE_SLIPPED (frm);