Mercurial > hg > xemacs-beta

comparison src/objects.c @ 874:d4ba25667ff4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
687 { 687 {
688 CHECK_CONS (matchspec); 688 CHECK_CONS (matchspec);
689 Fget_charset (XCAR (matchspec)); 689 Fget_charset (XCAR (matchspec));
690 } 690 }
691 691
692 #endif /* MULE */
693
694 void 692 void
695 initialize_charset_font_caches (struct device *d) 693 initialize_charset_font_caches (struct device *d)
696 { 694 {
697 /* Note that the following tables are bi-level. */ 695 /* Note that the following tables are bi-level. */
698 d->charset_font_cache_stage_1 = 696 d->charset_font_cache_stage_1 =
717 Qunbound); 715 Qunbound);
718 if (!UNBOUNDP (hash_table)) 716 if (!UNBOUNDP (hash_table))
719 Fclrhash (hash_table); 717 Fclrhash (hash_table);
720 } 718 }
721 } 719 }
720
721 #endif /* MULE */
722
722 723
723 static Lisp_Object 724 static Lisp_Object
724 font_instantiate (Lisp_Object specifier, Lisp_Object matchspec, 725 font_instantiate (Lisp_Object specifier, Lisp_Object matchspec,
725 Lisp_Object domain, Lisp_Object instantiator, 726 Lisp_Object domain, Lisp_Object instantiator,
726 Lisp_Object depth) 727 Lisp_Object depth)
759 instantiator = Ffont_instance_name (instantiator); 760 instantiator = Ffont_instance_name (instantiator);
760 } 761 }
761 762
762 if (STRINGP (instantiator)) 763 if (STRINGP (instantiator))
763 { 764 {
765 #ifdef MULE
764 Lisp_Object cache = stage ? d->charset_font_cache_stage_2 : 766 Lisp_Object cache = stage ? d->charset_font_cache_stage_2 :
765 d->charset_font_cache_stage_1; 767 d->charset_font_cache_stage_1;
768 #else
769 Lisp_Object cache = d->font_instance_cache;
770 #endif
766 771
767 #ifdef MULE 772 #ifdef MULE
768 if (!NILP (charset)) 773 if (!NILP (charset))
769 { 774 {
770 /* The instantiator is a font spec that could match many 775 /* The instantiator is a font spec that could match many