[Emacs-diffs] /srv/bzr/emacs/trunk r106515: Fix a thinko in revision 106511.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106515
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2011-11-25 17:22:30 +0200
message:
  Fix a thinko in revision 106511.
modified:
  src/xdisp.c

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-11-25 11:32:14 +0000
+++ b/src/xdisp.c       2011-11-25 15:22:30 +0000
@@ -15043,7 +15043,6 @@
   int centering_position = -1;
   int last_line_misfit = 0;
   EMACS_INT beg_unchanged, end_unchanged;
-  int scrolling_up;
 
   SET_TEXT_POS (lpoint, PT, PT_BYTE);
   opoint = lpoint;
@@ -15559,6 +15558,7 @@
        : 0;
       EMACS_INT margin_pos = CHARPOS (startp);
       Lisp_Object aggressive;
+      int scrolling_up;
 
       /* If there is a scroll margin at the top of the window, find
         its character position.  */
@@ -15730,8 +15730,9 @@
            scroll_margin > 0
            ? min (scroll_margin, WINDOW_TOTAL_LINES (w) / 4)
            : 0;
+         int move_down = w->cursor.vpos >= WINDOW_TOTAL_LINES (w) / 2;
 
-         move_it_by_lines (&it, scrolling_up ? margin + 1 : margin -1);
+         move_it_by_lines (&it, move_down ? margin + 1 : -(margin + 1));
          clear_glyph_matrix (w->desired_matrix);
          if (1 == try_window (window, it.current.pos,
                               TRY_WINDOW_CHECK_MARGINS))