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

[Juanma Barranquero]

Index: emacs/src/window.h
diff -c emacs/src/window.h:1.50 emacs/src/window.h:1.51
*** emacs/src/window.h:1.50     Mon Jul  1 03:59:16 2002
--- emacs/src/window.h  Tue Feb  4 09:03:17 2003
***************
*** 212,218 ****
      /* Original window height and top before mini-window was
         enlarged. */
      Lisp_Object orig_height, orig_top;
!     
      /* No Lisp data may follow below this point without changing
         mark_object in alloc.c.  The member current_matrix must be the
         first non-Lisp member.  */
--- 212,218 ----
      /* Original window height and top before mini-window was
         enlarged. */
      Lisp_Object orig_height, orig_top;
! 
      /* No Lisp data may follow below this point without changing
         mark_object in alloc.c.  The member current_matrix must be the
         first non-Lisp member.  */
***************
*** 228,244 ****
      /* Intended cursor position.   This is a position within the
         glyph matrix.  */
      struct cursor_pos cursor;
!     
      /* Where the cursor actually is.  */
      struct cursor_pos phys_cursor;
!     
!     /* Cursor type and width of last cursor drawn on the window.  
         Used for X and w32 frames; -1 initially.  */
      int phys_cursor_type, phys_cursor_width;
  
      /* This is handy for undrawing the cursor.  */
      int phys_cursor_ascent, phys_cursor_height;
!     
      /* Non-zero means the cursor is currently displayed.  This can be
         set to zero by functions overpainting the cursor image.  */
      unsigned phys_cursor_on_p : 1;
--- 228,244 ----
      /* Intended cursor position.   This is a position within the
         glyph matrix.  */
      struct cursor_pos cursor;
! 
      /* Where the cursor actually is.  */
      struct cursor_pos phys_cursor;
! 
!     /* Cursor type and width of last cursor drawn on the window.
         Used for X and w32 frames; -1 initially.  */
      int phys_cursor_type, phys_cursor_width;
  
      /* This is handy for undrawing the cursor.  */
      int phys_cursor_ascent, phys_cursor_height;
! 
      /* Non-zero means the cursor is currently displayed.  This can be
         set to zero by functions overpainting the cursor image.  */
      unsigned phys_cursor_on_p : 1;
***************
*** 261,267 ****
      /* Amount by which lines of this window are scrolled in
         y-direction (smooth scrolling).  */
      int vscroll;
!     
      /* Z_BYTE - the buffer position of the last glyph in the current matrix
         of W.  Only valid if WINDOW_END_VALID is not nil.  */
      int window_end_bytepos;
--- 261,267 ----
      /* Amount by which lines of this window are scrolled in
         y-direction (smooth scrolling).  */
      int vscroll;
! 
      /* Z_BYTE - the buffer position of the last glyph in the current matrix
         of W.  Only valid if WINDOW_END_VALID is not nil.  */
      int window_end_bytepos;
***************
*** 284,290 ****
  /* Return the window column at which the text in window W starts.
     This is different from the `left' field because it does not include
     a left-hand scroll bar if any.  */
!    
  #define WINDOW_LEFT_MARGIN(W) \
       (XFASTINT ((W)->left) \
        + FRAME_LEFT_SCROLL_BAR_WIDTH (XFRAME (WINDOW_FRAME (W))))
--- 284,290 ----
  /* Return the window column at which the text in window W starts.
     This is different from the `left' field because it does not include
     a left-hand scroll bar if any.  */
! 
  #define WINDOW_LEFT_MARGIN(W) \
       (XFASTINT ((W)->left) \
        + FRAME_LEFT_SCROLL_BAR_WIDTH (XFRAME (WINDOW_FRAME (W))))
***************
*** 305,320 ****
           ? FRAME_SCROLL_BAR_COLS (XFRAME (WINDOW_FRAME (W))) \
           : 0))
  
! /* 1 if window W takes up the full width of its frame.  */ 
  
  #define WINDOW_FULL_WIDTH_P(W) \
       (XFASTINT ((W)->width) == FRAME_WINDOW_WIDTH (XFRAME (WINDOW_FRAME (W))))
  
! /* 1 if window W's has no other windows to its right in its frame.  */ 
  
  #define WINDOW_RIGHTMOST_P(W) \
       (WINDOW_RIGHT_EDGE (W) == FRAME_WINDOW_WIDTH (XFRAME (WINDOW_FRAME (W))))
!      
  
  /* This is the window in which the terminal's cursor should
     be left when nothing is being done with it.  This must
--- 305,320 ----
           ? FRAME_SCROLL_BAR_COLS (XFRAME (WINDOW_FRAME (W))) \
           : 0))
  
! /* 1 if window W takes up the full width of its frame.  */
  
  #define WINDOW_FULL_WIDTH_P(W) \
       (XFASTINT ((W)->width) == FRAME_WINDOW_WIDTH (XFRAME (WINDOW_FRAME (W))))
  
! /* 1 if window W's has no other windows to its right in its frame.  */
  
  #define WINDOW_RIGHTMOST_P(W) \
       (WINDOW_RIGHT_EDGE (W) == FRAME_WINDOW_WIDTH (XFRAME (WINDOW_FRAME (W))))
! 
  
  /* This is the window in which the terminal's cursor should
     be left when nothing is being done with it.  This must