Mercurial > emacs
changeset 70119:aebb8898adb3
(redisplay_window): If current window start is not at the
beginning of a line, select a new window start if buffer is modified
and window start is in the modified region, but the first change is
before window start.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Wed, 19 Apr 2006 23:20:21 +0000 |
| parents | 171d2c3be825 |
| children | a8b22f12b3dc |
| files | src/xdisp.c |
| diffstat | 1 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Wed Apr 19 23:20:08 2006 +0000 +++ b/src/xdisp.c Wed Apr 19 23:20:21 2006 +0000 @@ -12860,6 +12860,33 @@ || (XFASTINT (w->last_modified) >= MODIFF && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF))) { + + /* If first window line is a continuation line, and window start + is inside the modified region, but the first change is before + current window start, we must select a new window start.*/ + if (NILP (w->start_at_line_beg)) + { + /* Make sure beg_unchanged and end_unchanged are up to date. + Do it only if buffer has really changed. This may or may + not have been done by try_window_id (see which) already. */ + if (MODIFF > SAVE_MODIFF + /* This seems to happen sometimes after saving a buffer. */ + || BEG_UNCHANGED + END_UNCHANGED > Z_BYTE) + { + if (GPT - BEG < BEG_UNCHANGED) + BEG_UNCHANGED = GPT - BEG; + if (Z - GPT < END_UNCHANGED) + END_UNCHANGED = Z - GPT; + } + + if (CHARPOS (startp) > BEG + BEG_UNCHANGED + && CHARPOS (startp) <= Z - END_UNCHANGED) + { + centering_position = 0; + goto recenter; + } + } + #if GLYPH_DEBUG debug_method_add (w, "same window start"); #endif