martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(Fset_window_margins): Simplify arg checking.

Browse Source
This commit is contained in:
Kim F. Storm
2003-10-14 09:33:09 +00:00
parent 07107abc30
commit c2c3f20258
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/window.c
View File

@@ -5856,24 +5856,22 @@ A nil width parameter means no margin. */)
{
struct window *w = decode_window (window);
if (!NILP (left))
CHECK_NUMBER (left);
if (!NILP (right))
CHECK_NUMBER (right);
/* Check widths < 0 and translate a zero width to nil.
/* Translate negative or zero widths 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 (left))
{
CHECK_NUMBER (left);
if (XINT (left) <= 0)
left = 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))