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

[Kim F . Storm]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.509 emacs/src/window.c:1.510
*** emacs/src/window.c:1.509    Wed Jul  6 22:06:15 2005
--- emacs/src/window.c  Thu Jul  7 09:33:29 2005
***************
*** 1472,1478 ****
  
    /* Check if we have a v/hchild with a v/hchild.  In that case remove
       one of them.  */
!   
    if (! NILP (par->vchild) && ! NILP (XWINDOW (par->vchild)->vchild))
      {
        p = XWINDOW (par->vchild);
--- 1472,1478 ----
  
    /* Check if we have a v/hchild with a v/hchild.  In that case remove
       one of them.  */
! 
    if (! NILP (par->vchild) && ! NILP (XWINDOW (par->vchild)->vchild))
      {
        p = XWINDOW (par->vchild);
***************
*** 5357,5362 ****
--- 5357,5363 ----
      {
        arg = Fprefix_numeric_value (arg);
        CHECK_NUMBER (arg);
+       iarg = XINT (arg);
      }
  
    set_buffer_internal (buf);
***************
*** 5391,5397 ****
          int extra_line_spacing;
          int h = window_box_height (w);
  
-         iarg = XINT (arg);
          iarg = - max (-iarg, this_scroll_margin);
  
          SET_TEXT_POS (pt, PT, PT_BYTE);
--- 5392,5397 ----