Mercurial > hg > xemacs-beta

diff src/frame-gtk.c @ 3676:3ef0aaf3dc34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 141c2920ea48
children 229bd619740a
line wrap: on
line diff
--- a/src/frame-gtk.c	Sat Nov 11 22:51:05 2006 +0000
+++ b/src/frame-gtk.c	Sun Nov 12 13:40:09 2006 +0000
@@ -1430,6 +1430,17 @@
    {
      Lisp_Object font = FACE_FONT (Vdefault_face, frame, Vcharset_ascii);
 
+     /* It may be that instantiating the font has deleted the frame (will
+	happen if the user has specified a charset registry for ASCII that
+	isn't available on the server, and our fallback of iso8859-1 isn't
+	available; something vanishingly rare.) In that case, return from
+	this function. */
+
+     if (!FRAME_LIVE_P(frm))
+       {
+	 return;
+       }
+
      if (!EQ (font, Vthe_null_font_instance))
      {
 	 /* #### BILL!!! The X code set the XtNfont property of the