(Finternal_merge_in_global_face): Return a Lisp object.

diff --git a/src/xfaces.c b/src/xfaces.c
index 0049268e0339b7de7f99b5354c89567ff4773c97..349f8f9a0f05291678bc37471c71ff8a3beda214 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4583,6 +4583,8 @@ Default face attributes override any local face attributes.")
   for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
     if (! UNSPECIFIEDP (gvec[i]))
       lvec[i] = gvec[i];
+
+  return Qnil;
 }
 
 
@@ -5671,7 +5673,7 @@ best_matching_font (f, attrs, fonts, nfonts)
 {
   char *font_name;
   struct font_name *best;
-  int i, pt;
+  int i, pt = 0;
   int specified[4];
   int exact_p;