From: Gerd Moellmann Date: Mon, 6 Dec 1999 21:23:20 +0000 (+0000) Subject: (set_lface_from_font_name): Fix incomplete merge. X-Git-Tag: emacs-pretest-21.0.90~5854 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=397e4fae84e4f568b7280fbc5c39cd04f1f67653;p=emacs.git (set_lface_from_font_name): Fix incomplete merge. --- 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 + + * xfaces.c (set_lface_from_font_name): Fix incomplete merge. + 1999-12-04 Hrvoje Niksic * 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. */