Mercurial > emacs

comparison src/xfaces.c @ 83541:694bbb62a75d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-371 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-372 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-373 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-374 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-375 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-376 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-377 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-378 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-379 Merge from erc--emacs--21 * emacs@sv.gnu.org/emacs--devo--0--patch-380 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-381 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-382 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-383 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-384 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-385 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-386 Update from erc--emacs--22 * emacs@sv.gnu.org/emacs--devo--0--patch-387 Fix ERC bug introduced in last patch * emacs@sv.gnu.org/emacs--devo--0--patch-388 Update from erc--emacs--22 * emacs@sv.gnu.org/emacs--devo--0--patch-389 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-390 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-391 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-392 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-393 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-394 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-395 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-396 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-397 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-398 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-399 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-400 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-401 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-402 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-403 Rcirc update from Ryan Yeske * emacs@sv.gnu.org/emacs--devo--0--patch-404 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-405 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-406 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-407 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-408 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-409 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-410 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-411 Miscellaneous tq-related fixes. * emacs@sv.gnu.org/emacs--devo--0--patch-412 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-121 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-122 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-123 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-124 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-125 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-126 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-127 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-581
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 14 Oct 2006 16:56:21 +0000
parents 02e39decdc84 44f03dd44abf
children 034f67f59091
comparison
equal deleted inserted replaced
83540:0c89a85addc3 83541:694bbb62a75d
1190 } 1190 }
1191 UNBLOCK_INPUT; 1191 UNBLOCK_INPUT;
1192 1192
1193 if (bitmap_id < 0) 1193 if (bitmap_id < 0)
1194 { 1194 {
1195 add_to_log ("Invalid or undefined bitmap %s", name, Qnil); 1195 add_to_log ("Invalid or undefined bitmap `%s'", name, Qnil);
1196 bitmap_id = 0; 1196 bitmap_id = 0;
1197 1197
1198 if (w_ptr) 1198 if (w_ptr)
1199 *w_ptr = 0; 1199 *w_ptr = 0;
1200 if (h_ptr) 1200 if (h_ptr)
5732 if (default_face == NULL) 5732 if (default_face == NULL)
5733 { 5733 {
5734 if (!realize_basic_faces (f)) 5734 if (!realize_basic_faces (f))
5735 return -1; 5735 return -1;
5736 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); 5736 default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
5737 if (default_face == NULL)
5738 abort (); /* realize_basic_faces must have set it up */
5737 } 5739 }
5738 5740
5739 if (!get_lface_attributes (f, symbol, symbol_attrs, signal_p)) 5741 if (!get_lface_attributes (f, symbol, symbol_attrs, signal_p))
5740 return -1; 5742 return -1;
5741 5743
6236 if (def_face == NULL) 6238 if (def_face == NULL)
6237 { 6239 {
6238 if (! realize_basic_faces (f)) 6240 if (! realize_basic_faces (f))
6239 error ("Cannot realize default face"); 6241 error ("Cannot realize default face");
6240 def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); 6242 def_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
6243 if (def_face == NULL)
6244 abort (); /* realize_basic_faces must have set it up */
6241 } 6245 }
6242 6246
6243 /* Dispatch to the appropriate handler. */ 6247 /* Dispatch to the appropriate handler. */
6244 if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f)) 6248 if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
6245 supports = tty_supports_face_attributes_p (f, attrs, def_face); 6249 supports = tty_supports_face_attributes_p (f, attrs, def_face);