Mercurial > hg > xemacs-beta
comparison src/faces.c @ 874:d4ba25667ff4
[xemacs-hg @ 2002-06-22 17:14:43 by michaels]
2002-06-22 Mike Sperber <mike@xemacs.org>
* faces.c (face_property_matching_instance): Only set cdr of
matchspec if it's actually a cons.
* console.h: Define opaque console_methods to unbreak the build.
* objects.c (initialize_charset_font_caches):
(invalidate_charset_font_caches): Only define if we're MULE.
(font_instantiate): Unbreak for non-MULE.
author | michaels |
---|---|
date | Sat, 22 Jun 2002 17:14:45 +0000 |
parents | 79c6ff3eef26 |
children | c925bacdda60 |
comparison
equal
deleted
inserted
replaced
873:26f7cf2a4792 | 874:d4ba25667ff4 |
---|---|
561 GCPRO1 (matchspec); | 561 GCPRO1 (matchspec); |
562 retval = specifier_instance_no_quit (Fget (face, property, Qnil), matchspec, | 562 retval = specifier_instance_no_quit (Fget (face, property, Qnil), matchspec, |
563 domain, errb, no_fallback, depth); | 563 domain, errb, no_fallback, depth); |
564 if (UNBOUNDP (retval)) | 564 if (UNBOUNDP (retval)) |
565 { | 565 { |
566 Fsetcdr (matchspec, Qt); | 566 if (CONSP (matchspec)) |
567 Fsetcdr (matchspec, Qt); | |
567 retval = specifier_instance_no_quit (Fget (face, property, Qnil), | 568 retval = specifier_instance_no_quit (Fget (face, property, Qnil), |
568 matchspec, domain, errb, | 569 matchspec, domain, errb, |
569 no_fallback, depth); | 570 no_fallback, depth); |
570 } | 571 } |
571 UNGCPRO; | 572 UNGCPRO; |