mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-20 19:42:53 -08:00
Code Issues Projects Releases Wiki Activity

(redisplay_window): Check return value of

Browse source 
compute_window_start_on_continuation_line before forcing a window
start.
This commit is contained in:
Chong Yidong 2008-07-28 19:41:11 +00:00
parent 91594ca7b4
commit 4d2b0805d3
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/xdisp.c
View file

@ -13239,14 +13239,19 @@ 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)
&& 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))
{
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");