Mercurial > hg > xemacs-beta

comparison src/glyphs.c @ 4962:e813cf16c015

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 05:29:05 -0600
parents 304aebb79cd3 b3ce27ca7647
children 4d35e52790f8
comparison
equal deleted inserted replaced
4961:b90f8cf474e0 4962:e813cf16c015
1131 /* Make sure we don't try this twice. */ 1131 /* Make sure we don't try this twice. */
1132 IMAGE_INSTANCE_DEVICE (i) = Qnil; 1132 IMAGE_INSTANCE_DEVICE (i) = Qnil;
1133 } 1133 }
1134 1134
1135 static int 1135 static int
1136 image_instance_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) 1136 image_instance_equal (Lisp_Object obj1, Lisp_Object obj2, int depth,
1137 int UNUSED (foldcase))
1137 { 1138 {
1138 Lisp_Image_Instance *i1 = XIMAGE_INSTANCE (obj1); 1139 Lisp_Image_Instance *i1 = XIMAGE_INSTANCE (obj1);
1139 Lisp_Image_Instance *i2 = XIMAGE_INSTANCE (obj2); 1140 Lisp_Image_Instance *i2 = XIMAGE_INSTANCE (obj2);
1140 1141
1141 ERROR_CHECK_IMAGE_INSTANCE (obj1); 1142 ERROR_CHECK_IMAGE_INSTANCE (obj1);
2934 **********************************************************************/ 2935 **********************************************************************/
2935 2936
2936 #ifdef HAVE_GTK 2937 #ifdef HAVE_GTK
2937 /* Gtk has to be gratuitously different, eh? */ 2938 /* Gtk has to be gratuitously different, eh? */
2938 Lisp_Object 2939 Lisp_Object
2939 pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid) 2940 pixmap_to_lisp_data (Lisp_Object name, int UNUSED (ok_if_data_invalid))
2940 { 2941 {
2941 return (make_string_from_file (name)); 2942 return (make_string_from_file (name));
2942 } 2943 }
2943 #else 2944 #else
2944 Lisp_Object 2945 Lisp_Object
3705 be eq. 3706 be eq.
3706 3707
3707 This isn't concerned with "unspecified" attributes, that's what 3708 This isn't concerned with "unspecified" attributes, that's what
3708 #'glyph-differs-from-default-p is for. */ 3709 #'glyph-differs-from-default-p is for. */
3709 static int 3710 static int
3710 glyph_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) 3711 glyph_equal (Lisp_Object obj1, Lisp_Object obj2, int depth,
3712 int UNUSED (foldcase))
3711 { 3713 {
3712 Lisp_Glyph *g1 = XGLYPH (obj1); 3714 Lisp_Glyph *g1 = XGLYPH (obj1);
3713 Lisp_Glyph *g2 = XGLYPH (obj2); 3715 Lisp_Glyph *g2 = XGLYPH (obj2);
3714 3716
3715 depth++; 3717 depth++;
3716 3718
3717 return (internal_equal (g1->image, g2->image, depth) && 3719 return (internal_equal (g1->image, g2->image, depth) &&
3718 internal_equal (g1->contrib_p, g2->contrib_p, depth) && 3720 internal_equal (g1->contrib_p, g2->contrib_p, depth) &&
3719 internal_equal (g1->baseline, g2->baseline, depth) && 3721 internal_equal (g1->baseline, g2->baseline, depth) &&
3720 internal_equal (g1->face, g2->face, depth) && 3722 internal_equal (g1->face, g2->face, depth) &&
3721 !plists_differ (g1->plist, g2->plist, 0, 0, depth + 1)); 3723 !plists_differ (g1->plist, g2->plist, 0, 0, depth + 1, 0));
3722 } 3724 }
3723 3725
3724 static Hashcode 3726 static Hashcode
3725 glyph_hash (Lisp_Object obj, int depth) 3727 glyph_hash (Lisp_Object obj, int depth)
3726 { 3728 {