[Emacs-diffs] /srv/bzr/emacs/trunk r106644: Fix bug #10170 with extra scrolling after C-s.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106644
fixes bug(s): http://debbugs.gnu.org/10170
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2011-12-09 20:40:42 +0200
message:
  Fix bug #10170 with extra scrolling after C-s.
  
   src/xdisp.c (try_scrolling): Don't set scroll_down_p if dy is zero.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-12-09 12:33:20 +0000
+++ b/src/ChangeLog     2011-12-09 18:40:42 +0000
@@ -1,3 +1,8 @@
+2011-12-09  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (try_scrolling): Don't set scroll_down_p if dy is zero.
+       (Bug#10170)
+
 2011-12-09  YAMAMOTO Mitsuharu  <address@hidden>
 
        * unexelf.c (unexec) [NS_IMPL_GNUSTEP]: Take account of the case

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-12-05 08:55:25 +0000
+++ b/src/xdisp.c       2011-12-09 18:40:42 +0000
@@ -14360,7 +14360,7 @@
     {
       int scroll_margin_y;
 
-      /* Compute the pixel ypos of the scroll margin, then move it to
+      /* Compute the pixel ypos of the scroll margin, then move IT to
         either that ypos or PT, whichever comes first.  */
       start_display (&it, w, startp);
       scroll_margin_y = it.last_visible_y - this_scroll_margin
@@ -14390,7 +14390,8 @@
          if (dy > scroll_max)
            return SCROLLING_FAILED;
 
-         scroll_down_p = 1;
+         if (dy > 0)
+           scroll_down_p = 1;
        }
     }