Mercurial > hg > xemacs-beta

comparison src/faces.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 98af8a976fc3
children f6f6fc9eb269
comparison
equal deleted inserted replaced
3675:0492077a2e85 3676:3ef0aaf3dc34
1160 1160
1161 bound = 0; 1161 bound = 0;
1162 /* Lookup the face again, this time allowing the fallback. If this 1162 /* Lookup the face again, this time allowing the fallback. If this
1163 succeeds, it'll give a font intended for the script in question, 1163 succeeds, it'll give a font intended for the script in question,
1164 which is preferable to translating to ISO10646-1 and using the 1164 which is preferable to translating to ISO10646-1 and using the
1165 fixed-with fallback. */ 1165 fixed-width fallback. */
1166 new_val = face_property_matching_instance (face, Qfont, 1166 new_val = face_property_matching_instance (face, Qfont,
1167 charset, domain, 1167 charset, domain,
1168 ERROR_ME_DEBUG_WARN, 0, 1168 ERROR_ME_DEBUG_WARN, 0,
1169 Qzero, 1169 Qzero,
1170 initial); 1170 initial);
1838 1838
1839 static void 1839 static void
1840 update_EmacsFrame (Lisp_Object frame, Lisp_Object name) 1840 update_EmacsFrame (Lisp_Object frame, Lisp_Object name)
1841 { 1841 {
1842 struct frame *frm = XFRAME (frame); 1842 struct frame *frm = XFRAME (frame);
1843
1844 if (!FRAME_LIVE_P(frm))
1845 return;
1843 1846
1844 if (EQ (name, Qfont)) 1847 if (EQ (name, Qfont))
1845 MARK_FRAME_SIZE_SLIPPED (frm); 1848 MARK_FRAME_SIZE_SLIPPED (frm);
1846 1849
1847 MAYBE_FRAMEMETH (frm, update_frame_external_traits, (frm, name)); 1850 MAYBE_FRAMEMETH (frm, update_frame_external_traits, (frm, name));