From 334a2e2a82cb041ec1d0c744e408573aa37d8915 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Fri, 8 Sep 2000 14:19:31 +0000 Subject: [PATCH] (Finternal_merge_in_global_face): Return a Lisp object. --- src/xfaces.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/xfaces.c b/src/xfaces.c index 0049268e03..349f8f9a0f 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -4583,6 +4583,8 @@ Default face attributes override any local face attributes.") for (i = 1; i < LFACE_VECTOR_SIZE; ++i) if (! UNSPECIFIEDP (gvec[i])) lvec[i] = gvec[i]; + + return Qnil; } @@ -5671,7 +5673,7 @@ best_matching_font (f, attrs, fonts, nfonts) { char *font_name; struct font_name *best; - int i, pt; + int i, pt = 0; int specified[4]; int exact_p; -- 2.20.1