Fix scrolling with scroll-*-aggressively.

Aggressive scrolling backward by large distance still doesn't DTRT.

 src/xdisp.c (try_scrolling): When aggressive scrolling is in use, don't
 let point enter the opposite scroll margin as result of the scroll.
 (redisplay_window): Fix operator precedence in condition.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ef3a1546913..d4301c482e9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,6 +8,9 @@
         (redisplay_window): Even when falling back on "recentering",
         position point in the window according to scroll-conservatively,
         scroll-margin, and scroll-*-aggressively variables.  (Bug#6671)
+        (try_scrolling): When aggressive scrolling is in use, don't let
+        point enter the opposite scroll margin as result of the scroll.
+        (redisplay_window): Fix operator precedence in condition.
 
 2011-03-26  Juanma Barranquero  <lekktu@gmail.com>