Mercurial > emacs
changeset 80649:87ab83edd4a3
Revert last change.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 28 Jul 2008 19:52:35 +0000 |
| parents | ab9dc4b31ef3 |
| children | dccdef827de2 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 4 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Mon Jul 28 19:51:44 2008 +0000 +++ b/src/xdisp.c Mon Jul 28 19:52:35 2008 +0000 @@ -13239,19 +13239,14 @@ && 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");