Merge from trunk.

2 files changed, 15 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b5ba1d74f8a..bb2a0d20c1f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-08-25  Paul Eggert  <eggert@cs.ucla.edu>
+2011-08-26  Paul Eggert  <eggert@cs.ucla.edu>
 
         Integer and memory overflow issues (Bug#9196).
 
@@ -422,6 +422,11 @@
         (gs_load): Use printmax_t to print the widest integers possible.
         Check for integer overflow when computing image height and width.
 
+2011-08-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (redisplay_window): Don't force window start if point
+        will be invisible in the resulting window.  (Bug#9324)
+
 2011-08-25  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (compute_display_string_pos): Return 2 in DISP_PROP when
diff --git a/src/xdisp.c b/src/xdisp.c
index 5f7020ba379..b60e3b466a8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -15097,6 +15097,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
                || (XFASTINT (w->last_modified) >= MODIFF
                    && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)))
     {
+      int d1, d2, d3, d4, d5, d6;
 
       /* If first window line is a continuation line, and window start
          is inside the modified region, but the first change is before
@@ -15118,7 +15119,14 @@ redisplay_window (Lisp_Object window, int just_this_one_p)
              compute_window_start_on_continuation_line.  (See also
              bug#197).  */
           && XMARKER (w->start)->buffer == current_buffer
-          && compute_window_start_on_continuation_line (w))
+          && compute_window_start_on_continuation_line (w)
+          /* It doesn't make sense to force the window start like we
+             do at label force_start if it is already known that point
+             will not be visible in the resulting window, because
+             doing so will move point from its correct position
+             instead of scrolling the window to bring point into view.
+             See bug#9324.  */
+          && pos_visible_p (w, PT, &d1, &d2, &d3, &d4, &d5, &d6))
         {
           w->force_start = Qt;
           SET_TEXT_POS_FROM_MARKER (startp, w->start);