Revert last change.

diff --git a/src/ChangeLog b/src/ChangeLog
index 177af396c1f04ba80bd689ddf39b92aa42b227e8..1952f1155780dba7a61ed35635935b90411cec71 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,3 @@
-2008-07-28  Chong Yidong  <cyd@stupidchicken.com>
-
-       * xdisp.c (redisplay_window): Check return value of
-       compute_window_start_on_continuation_line before forcing a window
-       start.
-
 2008-07-26  Eli Zaretskii  <eliz@gnu.org>
 
        * term.c (syms_of_term): Fix last change.

diff --git a/src/xdisp.c b/src/xdisp.c
index 4cc4b5f233e669aede063940ceb33b589da3ac72..897dd440f1550161d52c243e1315a5e0644b79fe 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13239,19 +13239,14 @@ redisplay_window (window, just_this_one_p)
          && NILP (do_mouse_tracking)
          && CHARPOS (startp) > BEGV
          && CHARPOS (startp) > BEG + save_beg_unchanged
-         && CHARPOS (startp) <= Z - save_end_unchanged
-         /* Even if w->start_at_line_beg is nil, a new window may
-            start at a line_beg, since that's how set_buffer_window
-            sets it.  So, we need to check the return value of
-            compute_window_start_on_continuation_line.  (See also
-            bug#197).  */
-         && XMARKER (w->start)->buffer == current_buffer
-         && compute_window_start_on_continuation_line (w))
+         && CHARPOS (startp) <= Z - save_end_unchanged)
        {
          w->force_start = Qt;
+         if (XMARKER (w->start)->buffer == current_buffer)
+           compute_window_start_on_continuation_line (w);
          SET_TEXT_POS_FROM_MARKER (startp, w->start);
          goto force_start;
-       }
+       }
 
 #if GLYPH_DEBUG
       debug_method_add (w, "same window start");