Mercurial > emacs

comparison src/xfaces.c @ 90573:858cb33ae39d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 357-381) - Merge from gnus--rel--5.10 - Update from CVS - Merge from erc--emacs--21 * gnus--rel--5.10 (patch 116-122) - Update from CVS - Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-98
author Miles Bader <miles@gnu.org>
date Thu, 03 Aug 2006 11:45:23 +0000
parents 8a8e69664178 c594a1694d31
children 6823a91487f2
comparison
equal deleted inserted replaced
90572:ab9b8d043c39 90573:858cb33ae39d
6123 if (default_face == NULL) 6123 if (default_face == NULL)
6124 { 6124 {
6125 if (!realize_basic_faces (f)) 6125 if (!realize_basic_faces (f))
6126 return -1; 6126 return -1;
6127 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); 6127 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
6128 if (default_face == NULL)
6129 abort (); /* realize_basic_faces must have set it up */
6128 } 6130 }
6129 6131
6130 if (!get_lface_attributes (f, symbol, symbol_attrs, signal_p)) 6132 if (!get_lface_attributes (f, symbol, symbol_attrs, signal_p))
6131 return -1; 6133 return -1;
6132 6134
6628 if (def_face == NULL) 6630 if (def_face == NULL)
6629 { 6631 {
6630 if (! realize_basic_faces (f)) 6632 if (! realize_basic_faces (f))
6631 error ("Cannot realize default face"); 6633 error ("Cannot realize default face");
6632 def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); 6634 def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
6635 if (def_face == NULL)
6636 abort (); /* realize_basic_faces must have set it up */
6633 } 6637 }
6634 6638
6635 /* Dispatch to the appropriate handler. */ 6639 /* Dispatch to the appropriate handler. */
6636 if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) 6640 if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
6637 supports = tty_supports_face_attributes_p (f, attrs, def_face); 6641 supports = tty_supports_face_attributes_p (f, attrs, def_face);