Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 474-484)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 88-91)

   - Merge from emacs--cvs-trunk--0
   - Update FSF's address in GPL notices
   - Update from CVS

1 files changed, 5 insertions, 8 deletions

diff --git a/src/window.c b/src/window.c
index 941c0a00133..9ae9bbf55f4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1472,7 +1472,7 @@ delete_window (window)
 
   /* 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,6 +5357,7 @@ and redisplay normally--don't erase and redraw the frame.  */)
     {
       arg = Fprefix_numeric_value (arg);
       CHECK_NUMBER (arg);
+      iarg = XINT (arg);
     }
 
   set_buffer_internal (buf);
@@ -5391,7 +5392,6 @@ and redisplay normally--don't erase and redraw the frame.  */)
           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);
@@ -5453,7 +5453,6 @@ and redisplay normally--don't erase and redraw the frame.  */)
         {
           struct position pos;
 
-          iarg = XINT (arg);
           iarg = max (iarg, this_scroll_margin);
 
           pos = *vmotion (PT, -iarg, w);
@@ -5467,11 +5466,9 @@ and redisplay normally--don't erase and redraw the frame.  */)
       int ht = window_internal_height (w);
 
       if (center_p)
-        iarg = make_number (ht / 2);
-      else if (XINT (arg) < 0)
-        iarg = XINT (arg) + ht;
-      else
-        iarg = XINT (arg);
+        iarg = ht / 2;
+      else if (iarg < 0)
+        iarg += ht;
 
       /* Don't let it get into the margin at either top or bottom.  */
       iarg = max (iarg, this_scroll_margin);