Mercurial > hg > xemacs-beta
comparison src/frame-gtk.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 | 141c2920ea48 |
| children | 229bd619740a |
comparison
equal
deleted
inserted
replaced
| 3675:0492077a2e85 | 3676:3ef0aaf3dc34 |
|---|---|
| 1428 } | 1428 } |
| 1429 else if (EQ (name, Qfont)) | 1429 else if (EQ (name, Qfont)) |
| 1430 { | 1430 { |
| 1431 Lisp_Object font = FACE_FONT (Vdefault_face, frame, Vcharset_ascii); | 1431 Lisp_Object font = FACE_FONT (Vdefault_face, frame, Vcharset_ascii); |
| 1432 | 1432 |
| 1433 /* It may be that instantiating the font has deleted the frame (will | |
| 1434 happen if the user has specified a charset registry for ASCII that | |
| 1435 isn't available on the server, and our fallback of iso8859-1 isn't | |
| 1436 available; something vanishingly rare.) In that case, return from | |
| 1437 this function. */ | |
| 1438 | |
| 1439 if (!FRAME_LIVE_P(frm)) | |
| 1440 { | |
| 1441 return; | |
| 1442 } | |
| 1443 | |
| 1433 if (!EQ (font, Vthe_null_font_instance)) | 1444 if (!EQ (font, Vthe_null_font_instance)) |
| 1434 { | 1445 { |
| 1435 /* #### BILL!!! The X code set the XtNfont property of the | 1446 /* #### BILL!!! The X code set the XtNfont property of the |
| 1436 text widget here. Why did they bother? All that type of | 1447 text widget here. Why did they bother? All that type of |
| 1437 thing is done down in the guts of the redisplay code, not | 1448 thing is done down in the guts of the redisplay code, not |