2 files changed, 9 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e13ffe8fc66..d70edd2fbf9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-07  Kim F. Storm  <storm@cua.dk>
+
+        * window.c (Frecenter): Fix last change (set iarg before use).
+
 2005-07-06  Richard M. Stallman  <rms@gnu.org>
 
         * window.c (Frecenter): When arg is inside the scroll margin,
@@ -19,7 +23,7 @@
         assume that font family length is less than 32.
         (x_compute_min_glyph_bounds): Make static.
         (x_load_font): Never set fonts_changed_p to zero.
-        
+
 2005-07-04  Lute Kamstra  <lute@gnu.org>
 
         * Update FSF's address in GPL notices.
diff --git a/src/window.c b/src/window.c
index d9af9ba72ac..a55043ad673 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1474,7 +1474,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);
@@ -5359,6 +5359,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);
@@ -5393,7 +5394,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);
@@ -5455,7 +5455,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);
@@ -5470,10 +5469,8 @@ and redisplay normally--don't erase and redraw the frame.  */)
 
       if (center_p)
         iarg = make_number (ht / 2);
-      else if (XINT (arg) < 0)
-        iarg = XINT (arg) + ht;
-      else
-        iarg = XINT (arg);
+      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);