From c2c3f20258e994024bfea4cf2e2ceec1fedf4ee4 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Tue, 14 Oct 2003 09:33:09 +0000 Subject: [PATCH] (Fset_window_margins): Simplify arg checking. --- src/window.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/window.c b/src/window.c index 824200dc18f..10de132fcce 100644 --- a/src/window.c +++ b/src/window.c @@ -5856,24 +5856,22 @@ A nil width parameter means no margin. */) { struct window *w = decode_window (window); + /* Translate negative or zero widths to nil. + Margins that are too wide have to be checked elsewhere. */ + if (!NILP (left)) - CHECK_NUMBER (left); - if (!NILP (right)) - CHECK_NUMBER (right); + { + CHECK_NUMBER (left); + if (XINT (left) <= 0) + left = Qnil; + } - /* Check widths < 0 and translate a zero width to nil. - Margins that are too wide have to be checked elsewhere. */ - if ((INTEGERP (left) && XINT (left) < 0) - || (FLOATP (left) && XFLOAT_DATA (left) <= 0)) - XSETFASTINT (left, 0); - if (INTEGERP (left) && XFASTINT (left) == 0) - left = Qnil; - - if ((INTEGERP (right) && XINT (right) < 0) - || (FLOATP (right) && XFLOAT_DATA (right) <= 0)) - XSETFASTINT (right, 0); - if (INTEGERP (right) && XFASTINT (right) == 0) - right = Qnil; + if (!NILP (right)) + { + CHECK_NUMBER (right); + if (XINT (right) <= 0) + right = Qnil; + } if (!EQ (w->left_margin_cols, left) || !EQ (w->right_margin_cols, right)) -- 2.39.2