Mercurial > hg > xemacs-beta

comparison src/objects.c @ 2:ac2d302a0011 r19-15b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b2
author cvs
date Mon, 13 Aug 2007 08:46:35 +0200
parents 376386a54a3c
children 859a2309aef8
comparison
equal deleted inserted replaced
1:c0c6a60d29db 2:ac2d302a0011
701 ((markobj) (FONT_SPECIFIER_FACE_PROPERTY (font))); 701 ((markobj) (FONT_SPECIFIER_FACE_PROPERTY (font)));
702 } 702 }
703 703
704 /* No equal or hash methods; ignore the face the font is based off 704 /* No equal or hash methods; ignore the face the font is based off
705 of for `equal' */ 705 of for `equal' */
706
707 int
708 font_spec_matches_charset (struct device *d, Lisp_Object charset,
709 CONST Bufbyte *nonreloc, Lisp_Object reloc,
710 Bytecount offset, Bytecount length)
711 {
712 return DEVMETH_OR_GIVEN (d, font_spec_matches_charset,
713 (d, charset, nonreloc, reloc, offset, length),
714 1);
715 }
716
717 static Lisp_Object 706 static Lisp_Object
718 font_instantiate (Lisp_Object specifier, Lisp_Object matchspec, 707 font_instantiate (Lisp_Object specifier, Lisp_Object matchspec,
719 Lisp_Object domain, Lisp_Object instantiator, 708 Lisp_Object domain, Lisp_Object instantiator,
720 Lisp_Object depth) 709 Lisp_Object depth)
721 { 710 {
732 { 721 {
733 return instantiator; 722 return instantiator;
734 } 723 }
735 instantiator = Ffont_instance_name (instantiator); 724 instantiator = Ffont_instance_name (instantiator);
736 } 725 }
737 else if (STRINGP (instantiator)) 726
727 if (STRINGP (instantiator))
738 { 728 {
739 /* First, look to see if we can retrieve a cached value. */ 729 /* First, look to see if we can retrieve a cached value. */
740 instance = Fgethash (instantiator, d->font_instance_cache, Qunbound); 730 instance = Fgethash (instantiator, d->font_instance_cache, Qunbound);
741 /* Otherwise, make a new one. */ 731 /* Otherwise, make a new one. */
742 if (UNBOUNDP (instance)) 732 if (UNBOUNDP (instance))