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

[Juanma Barranquero]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.512 emacs/src/window.c:1.513
*** emacs/src/window.c:1.512    Mon Jul 11 21:43:10 2005
--- emacs/src/window.c  Thu Jul 21 16:34:51 2005
***************
*** 6246,6278 ****
  reserve for the left marginal area.  Optional third arg RIGHT-WIDTH
  does the same for the right marginal area.  A nil width parameter
  means no margin.  */)
!      (window, left, right)
!      Lisp_Object window, left, right;
  {
    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))
      {
!       w->left_margin_cols = left;
!       w->right_margin_cols = right;
  
        adjust_window_margins (w);
  
--- 6246,6278 ----
  reserve for the left marginal area.  Optional third arg RIGHT-WIDTH
  does the same for the right marginal area.  A nil width parameter
  means no margin.  */)
!      (window, left_width, right_width)
!      Lisp_Object window, left_width, right_width;
  {
    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_width))
      {
!       CHECK_NUMBER (left_width);
!       if (XINT (left_width) <= 0)
!       left_width = Qnil;
      }
  
!   if (!NILP (right_width))
      {
!       CHECK_NUMBER (right_width);
!       if (XINT (right_width) <= 0)
!       right_width = Qnil;
      }
  
!   if (!EQ (w->left_margin_cols, left_width)
!       || !EQ (w->right_margin_cols, right_width))
      {
!       w->left_margin_cols = left_width;
!       w->right_margin_cols = right_width;
  
        adjust_window_margins (w);
  
***************
*** 6317,6338 ****
  If optional fourth arg OUTSIDE-MARGINS is non-nil, draw the fringes
  outside of the display margins.  By default, fringes are drawn between
  display marginal areas and the text area.  */)
!      (window, left, right, outside_margins)
!      Lisp_Object window, left, right, outside_margins;
  {
    struct window *w = decode_window (window);
  
!   if (!NILP (left))
!     CHECK_NATNUM (left);
!   if (!NILP (right))
!     CHECK_NATNUM (right);
  
!   if (!EQ (w->left_fringe_width, left)
!       || !EQ (w->right_fringe_width, right)
        || !EQ (w->fringes_outside_margins, outside_margins))
      {
!       w->left_fringe_width = left;
!       w->right_fringe_width = right;
        w->fringes_outside_margins = outside_margins;
  
        adjust_window_margins (w);
--- 6317,6338 ----
  If optional fourth arg OUTSIDE-MARGINS is non-nil, draw the fringes
  outside of the display margins.  By default, fringes are drawn between
  display marginal areas and the text area.  */)
!      (window, left_width, right_width, outside_margins)
!      Lisp_Object window, left_width, right_width, outside_margins;
  {
    struct window *w = decode_window (window);
  
!   if (!NILP (left_width))
!     CHECK_NATNUM (left_width);
!   if (!NILP (right_width))
!     CHECK_NATNUM (right_width);
  
!   if (!EQ (w->left_fringe_width, left_width)
!       || !EQ (w->right_fringe_width, right_width)
        || !EQ (w->fringes_outside_margins, outside_margins))
      {
!       w->left_fringe_width = left_width;
!       w->right_fringe_width = right_width;
        w->fringes_outside_margins = outside_margins;
  
        adjust_window_margins (w);