# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 968422771 0
# Node ID ac6d049932e9f9bc2b62b2257fff68b318d61674
# Parent  a1d7334284917aac5707d5108fa0195a0642509c
(Finternal_merge_in_global_face): Return a Lisp object.

diff -r a1d733428491 -r ac6d049932e9 src/xfaces.c
--- a/src/xfaces.c	Fri Sep 08 14:19:11 2000 +0000
+++ b/src/xfaces.c	Fri Sep 08 14:19:31 2000 +0000
@@ -4583,6 +4583,8 @@
   for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
     if (! UNSPECIFIEDP (gvec[i]))
       lvec[i] = gvec[i];
+
+  return Qnil;
 }
 
 
@@ -5671,7 +5673,7 @@
 {
   char *font_name;
   struct font_name *best;
-  int i, pt;
+  int i, pt = 0;
   int specified[4];
   int exact_p;