diff --git a/src/ChangeLog b/src/ChangeLog
index 6f0eba3af48..091604204d8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+1999-12-06  Gerd Moellmann  <gerd@gnu.org>
+
+	* xfaces.c (set_lface_from_font_name): Fix incomplete merge.
+
 1999-12-04  Hrvoje Niksic  <hniksic@iskon.hr>
 
 	* lread.c (Fintern_soft): Accept a symbol argument.
diff --git a/src/xfaces.c b/src/xfaces.c
index 05a0d2dfe37..5fb16e5509d 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2769,7 +2769,7 @@ lface_fully_specified_p (attrs)
    for split_font_name, see the comment there.  */
    
 static int
-set_lface_from_font_name (f, lface, font_name, force_p)
+set_lface_from_font_name (f, lface, font_name, force_p, may_fail_p)
      struct frame *f;
      Lisp_Object lface;
      char *font_name;
@@ -2809,6 +2809,7 @@ set_lface_from_font_name (f, lface, font_name, force_p)
 	    }
 	  UNBLOCK_INPUT;
 	}
+    }
 
   /* If FONT_NAME is completely bogus try to use something reasonable
      if this function must succeed.  Otherwise, give up.  */