Mercurial > hg > xemacs-beta
comparison src/glyphs.c @ 5027:22179cd0fe15
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 10 Feb 2010 07:25:19 -0600 |
parents | ae48681c47fa |
children | 78a3c171a427 b5df3737028a 8b2f75cecb89 |
comparison
equal
deleted
inserted
replaced
5026:46cf825f6158 | 5027:22179cd0fe15 |
---|---|
658 /* This function can GC */ | 658 /* This function can GC */ |
659 /* value can be nil; we cache failures as well as successes */ | 659 /* value can be nil; we cache failures as well as successes */ |
660 if (!NILP (value)) | 660 if (!NILP (value)) |
661 { | 661 { |
662 Lisp_Object window; | 662 Lisp_Object window; |
663 window = VOID_TO_LISP (flag_closure); | 663 window = GET_LISP_FROM_VOID (flag_closure); |
664 assert (EQ (XIMAGE_INSTANCE_DOMAIN (value), window)); | 664 assert (EQ (XIMAGE_INSTANCE_DOMAIN (value), window)); |
665 } | 665 } |
666 | 666 |
667 return 0; | 667 return 0; |
668 } | 668 } |
674 | 674 |
675 | 675 |
676 assert (!NILP (w->subwindow_instance_cache)); | 676 assert (!NILP (w->subwindow_instance_cache)); |
677 elisp_maphash (check_instance_cache_mapper, | 677 elisp_maphash (check_instance_cache_mapper, |
678 w->subwindow_instance_cache, | 678 w->subwindow_instance_cache, |
679 LISP_TO_VOID (window)); | 679 STORE_LISP_IN_VOID (window)); |
680 } | 680 } |
681 | 681 |
682 void | 682 void |
683 check_image_instance_structure (Lisp_Object instance) | 683 check_image_instance_structure (Lisp_Object instance) |
684 { | 684 { |