Commit ccd485aa authored by Chong Yidong's avatar Chong Yidong
Browse files

(redisplay_window): Check return value of

compute_window_start_on_continuation_line before forcing a window
parent fc2fe151
......@@ -13658,11 +13658,16 @@ redisplay_window (window, just_this_one_p)
&& NILP (do_mouse_tracking)
&& CHARPOS (startp) > BEGV
&& CHARPOS (startp) > BEG + beg_unchanged
&& CHARPOS (startp) <= Z - end_unchanged)
&& CHARPOS (startp) <= Z - 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))
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;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment