# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1105963812 0
# Node ID 609c840fe65f26ec4df4d69d6064301e7ea050e9
# Parent  2874904abbd42654b60192192ed01d04403cef85
(merge_faces): Fix argument to lookup_derived_face and
lookup_face.

diff -r 2874904abbd4 -r 609c840fe65f src/xfaces.c
--- a/src/xfaces.c	Mon Jan 17 12:09:23 2005 +0000
+++ b/src/xfaces.c	Mon Jan 17 12:10:12 2005 +0000
@@ -7914,7 +7914,7 @@
       if (face_id < 0 || face_id >= lface_id_to_name_size)
 	return base_face_id;
       face_name = lface_id_to_name[face_id];
-      face_id = lookup_derived_face (f, face_name, 0, base_face_id);
+      face_id = lookup_derived_face (f, face_name, base_face_id);
       if (face_id >= 0)
 	return face_id;
       return base_face_id;
@@ -7941,7 +7941,7 @@
 
   /* Look up a realized face with the given face attributes,
      or realize a new one for ASCII characters.  */
-  return lookup_face (f, attrs, 0, NULL);
+  return lookup_face (f, attrs);
 }