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

[Miles Bader]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.445.2.9 emacs/src/window.c:1.445.2.10
*** emacs/src/window.c:1.445.2.9        Thu Sep  9 09:36:35 2004
--- emacs/src/window.c  Thu Oct 14 08:49:53 2004
***************
*** 607,615 ****
    int grabbable_width = ux;
    int lmargin_width, rmargin_width, text_left, text_right;
  
-   if (*x < x0 || *x >= x1)
-     return ON_NOTHING;
- 
    /* In what's below, we subtract 1 when computing right_x because we
       want the rightmost pixel, which is given by left_pixel+width-1.  */
    if (w->pseudo_window_p)
--- 607,612 ----
***************
*** 659,664 ****
--- 656,664 ----
            return ON_VERTICAL_BORDER;
        }
  
+       if (*x < x0 || *x >= x1)
+       return ON_NOTHING;
+ 
        /* Convert X and Y to window relative coordinates.
         Mode line starts at left edge of window.  */
        *x -= x0;
***************
*** 673,678 ****
--- 673,681 ----
        goto header_vertical_border_check;
      }
  
+   if (*x < x0 || *x >= x1)
+     return ON_NOTHING;
+ 
    /* Outside any interesting column?  */
    if (*x < left_x || *x > right_x)
      return ON_SCROLL_BAR;
***************
*** 6034,6042 ****
    struct window *w = decode_window (window);
  
    if (!NILP (left))
!     CHECK_NUMBER (left);
    if (!NILP (right))
!     CHECK_NUMBER (right);
  
    if (!EQ (w->left_fringe_width, left)
        || !EQ (w->right_fringe_width, right)
--- 6037,6045 ----
    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)
***************
*** 6096,6102 ****
    struct window *w = decode_window (window);
  
    if (!NILP (width))
!     CHECK_NUMBER (width);
  
    if (XINT (width) == 0)
      vertical_type = Qnil;
--- 6099,6105 ----
    struct window *w = decode_window (window);
  
    if (!NILP (width))
!     CHECK_NATNUM (width);
  
    if (XINT (width) == 0)
      vertical_type = Qnil;