Mercurial > hg > xemacs-beta
diff src/glyphs.c @ 4962:e813cf16c015
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 05:29:05 -0600 |
parents | 304aebb79cd3 b3ce27ca7647 |
children | 4d35e52790f8 |
line wrap: on
line diff
--- a/src/glyphs.c Sun Jan 31 21:11:44 2010 -0600 +++ b/src/glyphs.c Mon Feb 01 05:29:05 2010 -0600 @@ -1133,7 +1133,8 @@ } static int -image_instance_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) +image_instance_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, + int UNUSED (foldcase)) { Lisp_Image_Instance *i1 = XIMAGE_INSTANCE (obj1); Lisp_Image_Instance *i2 = XIMAGE_INSTANCE (obj2); @@ -2936,7 +2937,7 @@ #ifdef HAVE_GTK /* Gtk has to be gratuitously different, eh? */ Lisp_Object -pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid) +pixmap_to_lisp_data (Lisp_Object name, int UNUSED (ok_if_data_invalid)) { return (make_string_from_file (name)); } @@ -3707,7 +3708,8 @@ This isn't concerned with "unspecified" attributes, that's what #'glyph-differs-from-default-p is for. */ static int -glyph_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) +glyph_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, + int UNUSED (foldcase)) { Lisp_Glyph *g1 = XGLYPH (obj1); Lisp_Glyph *g2 = XGLYPH (obj2); @@ -3718,7 +3720,7 @@ internal_equal (g1->contrib_p, g2->contrib_p, depth) && internal_equal (g1->baseline, g2->baseline, depth) && internal_equal (g1->face, g2->face, depth) && - !plists_differ (g1->plist, g2->plist, 0, 0, depth + 1)); + !plists_differ (g1->plist, g2->plist, 0, 0, depth + 1, 0)); } static Hashcode