From d8055bfc8f4883f2bfc217b448cba1461252db27 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Thu, 18 Oct 2001 09:50:37 +0000 Subject: [PATCH] (Finternal_set_lisp_face_attribute): Follow coding conventions. --- src/xfaces.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/xfaces.c b/src/xfaces.c index 9971541cd31..acb5820db83 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -3831,13 +3831,16 @@ FRAME 0 means change the face on all frames, and change the default { if (!UNSPECIFIEDP (value)) { - Lisp_Object test = - (EQ (face, Qdefault) ? value : - /* The default face must have an absolute size, otherwise, we do - a test merge with a random height to see if VALUE's ok. */ - merge_face_heights (value, make_number(10), Qnil, Qnil)); + Lisp_Object test; - if (!INTEGERP(test) || XINT(test) <= 0) + test = (EQ (face, Qdefault) + ? value + /* The default face must have an absolute size, + otherwise, we do a test merge with a random + height to see if VALUE's ok. */ + : merge_face_heights (value, make_number (10), Qnil, Qnil)); + + if (!INTEGERP (test) || XINT (test) <= 0) signal_error ("Invalid face height", value); } -- 2.39.2