# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 944515321 0
# Node ID 1ecff19224625e0d8bb4275d0b90d46712595b91
# Parent  04b50bb09da3d8a963f789b160d3e2e8668615e1
(set_lface_from_font_name): Fix incomplete merge.

diff -r 04b50bb09da3 -r 1ecff1922462 src/xfaces.c
--- a/src/xfaces.c	Mon Dec 06 19:46:40 1999 +0000
+++ b/src/xfaces.c	Mon Dec 06 21:22:01 1999 +0000
@@ -2769,7 +2769,7 @@
    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 @@
 	    }
 	  UNBLOCK_INPUT;
 	}
+    }
 
   /* If FONT_NAME is completely bogus try to use something reasonable
      if this function must succeed.  Otherwise, give up.  */