[Emacs-diffs] Changes to emacs/src/window.c

[Kim F. Storm]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.452 emacs/src/window.c:1.453
*** emacs/src/window.c:1.452    Mon Oct 13 14:44:22 2003
--- emacs/src/window.c  Tue Oct 14 05:33:09 2003
***************
*** 5856,5879 ****
  {
    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.
       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 (!EQ (w->left_margin_cols, left)
        || !EQ (w->right_margin_cols, right))
--- 5856,5877 ----
  {
    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 (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))