Mercurial > emacs

changeset 26740:1ecff1922462

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(set_lface_from_font_name): Fix incomplete merge.
author Gerd Moellmann <gerd@gnu.org>
date Mon, 06 Dec 1999 21:22:01 +0000
parents 04b50bb09da3
children f8cf4dd95449
files src/xfaces.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.  */