comparison src/faces.c @ 4962:e813cf16c015

merge
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 05:29:05 -0600
parents 304aebb79cd3 6ef8256a020a
children cbe181529c34
comparison
equal deleted inserted replaced
4961:b90f8cf474e0 4962:e813cf16c015
1 /* "Face" primitives 1 /* "Face" primitives
2 Copyright (C) 1994 Free Software Foundation, Inc. 2 Copyright (C) 1994 Free Software Foundation, Inc.
3 Copyright (C) 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 1995, 1996, 2001, 2002 Ben Wing. 4 Copyright (C) 1995, 1996, 2001, 2002, 2010 Ben Wing.
5 Copyright (C) 1995 Sun Microsystems, Inc. 5 Copyright (C) 1995 Sun Microsystems, Inc.
6 6
7 This file is part of XEmacs. 7 This file is part of XEmacs.
8 8
9 XEmacs is free software; you can redistribute it and/or modify it 9 XEmacs is free software; you can redistribute it and/or modify it
146 be eq. 146 be eq.
147 147
148 This isn't concerned with "unspecified" attributes, that's what 148 This isn't concerned with "unspecified" attributes, that's what
149 #'face-differs-from-default-p is for. */ 149 #'face-differs-from-default-p is for. */
150 static int 150 static int
151 face_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) 151 face_equal (Lisp_Object obj1, Lisp_Object obj2, int depth,
152 int UNUSED (foldcase))
152 { 153 {
153 Lisp_Face *f1 = XFACE (obj1); 154 Lisp_Face *f1 = XFACE (obj1);
154 Lisp_Face *f2 = XFACE (obj2); 155 Lisp_Face *f2 = XFACE (obj2);
155 156
156 depth++; 157 depth++;
166 internal_equal (f1->highlight, f2->highlight, depth) && 167 internal_equal (f1->highlight, f2->highlight, depth) &&
167 internal_equal (f1->dim, f2->dim, depth) && 168 internal_equal (f1->dim, f2->dim, depth) &&
168 internal_equal (f1->blinking, f2->blinking, depth) && 169 internal_equal (f1->blinking, f2->blinking, depth) &&
169 internal_equal (f1->reverse, f2->reverse, depth) && 170 internal_equal (f1->reverse, f2->reverse, depth) &&
170 171
171 ! plists_differ (f1->plist, f2->plist, 0, 0, depth + 1)); 172 ! plists_differ (f1->plist, f2->plist, 0, 0, depth + 1, 0));
172 } 173 }
173 174
174 static Hashcode 175 static Hashcode
175 face_hash (Lisp_Object obj, int depth) 176 face_hash (Lisp_Object obj, int depth)
176 { 177 {