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

[Juanma Barranquero]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.440 emacs/src/window.c:1.441
*** emacs/src/window.c:1.440    Sat May 24 18:07:51 2003
--- emacs/src/window.c  Sat May 24 22:11:24 2003
***************
*** 578,584 ****
          if (!WINDOW_LEFTMOST_P (w) && abs (*x - x0) < grabbable_width)
            return ON_VERTICAL_BORDER;
        }
!       else 
        {
          if (abs (*x - x1) < grabbable_width)
            return ON_VERTICAL_BORDER;
--- 578,584 ----
          if (!WINDOW_LEFTMOST_P (w) && abs (*x - x0) < grabbable_width)
            return ON_VERTICAL_BORDER;
        }
!       else
        {
          if (abs (*x - x1) < grabbable_width)
            return ON_VERTICAL_BORDER;
***************
*** 601,607 ****
  
    lmargin_width = window_box_width (w, LEFT_MARGIN_AREA);
    rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA);
!   
    text_left = window_box_left (w, TEXT_AREA);
    text_right = text_left + window_box_width (w, TEXT_AREA);
  
--- 601,607 ----
  
    lmargin_width = window_box_width (w, LEFT_MARGIN_AREA);
    rmargin_width = window_box_width (w, RIGHT_MARGIN_AREA);
! 
    text_left = window_box_left (w, TEXT_AREA);
    text_right = text_left + window_box_width (w, TEXT_AREA);
  
***************
*** 2419,2425 ****
  }
  
  
! /* Adjust the margins of window W if text area is too small.  
     Return 1 if window width is ok after adjustment; 0 if window
     is still too narrow.  */
  
--- 2419,2425 ----
  }
  
  
! /* Adjust the margins of window W if text area is too small.
     Return 1 if window width is ok after adjustment; 0 if window
     is still too narrow.  */
  
***************
*** 2766,2772 ****
      {
        /* Set left and right marginal area width etc. from buffer.  */
  
!       /* This may call adjust_window_margins three times, so 
         temporarily disable window margins.  */
        w->left_margin_cols = w->right_margin_cols = Qnil;
  
--- 2766,2772 ----
      {
        /* Set left and right marginal area width etc. from buffer.  */
  
!       /* This may call adjust_window_margins three times, so
         temporarily disable window margins.  */
        w->left_margin_cols = w->right_margin_cols = Qnil;
  
***************
*** 2799,2805 ****
  
  DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0,
         doc: /* Make WINDOW display BUFFER as its contents.
! BUFFER can be a buffer or buffer name.  
  Optional third arg KEEP_MARGINS non-nil means that WINDOW's current
  display margins, fringe widths, and scroll bar settings are maintained;
  the default is to reset these from BUFFER's local settings or the frame
--- 2799,2805 ----
  
  DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0,
         doc: /* Make WINDOW display BUFFER as its contents.
! BUFFER can be a buffer or buffer name.
  Optional third arg KEEP_MARGINS non-nil means that WINDOW's current
  display margins, fringe widths, and scroll bar settings are maintained;
  the default is to reset these from BUFFER's local settings or the frame
***************
*** 5707,5713 ****
  If window is nil, set fringes of the currently selected window.
  Second parameter LEFT-WIDTH specifies the number of pixels to reserve
  for the left fringe.  Third parameter RIGHT-WIDTH does the same for
! the right fringe.  Fourth parameter OUTSIDE-MARGINS non-nil specifies 
  that fringes are drawn outside of the display margins; by default, fringes
  are drawn between display marginal areas and the text area.
  A nil width parameter means to use the frame's corresponding fringe width.  
*/)
--- 5707,5713 ----
  If window is nil, set fringes of the currently selected window.
  Second parameter LEFT-WIDTH specifies the number of pixels to reserve
  for the left fringe.  Third parameter RIGHT-WIDTH does the same for
! the right fringe.  Fourth parameter OUTSIDE-MARGINS non-nil specifies
  that fringes are drawn outside of the display margins; by default, fringes
  are drawn between display marginal areas and the text area.
  A nil width parameter means to use the frame's corresponding fringe width.  
*/)
***************
*** 5774,5781 ****
  Third parameter VERTICAL-TYPE specifies the type of the vertical scroll
  bar: left, right, or nil.
  A width of nil and type of t means to use the frame's corresponding value.  
*/)
!      (window, width, vertical_type, horisontal_type)
!      Lisp_Object window, width, vertical_type, horisontal_type;
  {
    struct window *w = decode_window (window);
  
--- 5774,5781 ----
  Third parameter VERTICAL-TYPE specifies the type of the vertical scroll
  bar: left, right, or nil.
  A width of nil and type of t means to use the frame's corresponding value.  
*/)
!      (window, width, vertical_type, horizontal_type)
!      Lisp_Object window, width, vertical_type, horizontal_type;
  {
    struct window *w = decode_window (window);
  
***************
*** 5808,5814 ****
         0, 1, 0,
         doc: /* Get width and type of scroll bars of window WINDOW.
  If WINDOW is omitted or nil, use the currently selected window.
! Value is a list of the form (WIDTH COLS VERTICAL-TYPE HORISONTAL-TYPE).  */)
       (window)
       Lisp_Object window;
  {
--- 5808,5814 ----
         0, 1, 0,
         doc: /* Get width and type of scroll bars of window WINDOW.
  If WINDOW is omitted or nil, use the currently selected window.
! Value is a list of the form (WIDTH COLS VERTICAL-TYPE HORIZONTAL-TYPE).  */)
       (window)
       Lisp_Object window;
  {