From: Gerd Moellmann Date: Sun, 28 Nov 1999 12:48:29 +0000 (+0000) Subject: (Fwindow_end): Don't call temp_set_pt_both with X-Git-Tag: emacs-pretest-21.0.90~5945 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d6d9df0f45890e10d0563406a99d678a8f42583;p=emacs.git (Fwindow_end): Don't call temp_set_pt_both with out of range position. --- diff --git a/src/window.c b/src/window.c index ecce77d6df1..dc01b2faedf 100644 --- a/src/window.c +++ b/src/window.c @@ -720,8 +720,21 @@ if it isn't already recorded.") && XFASTINT (w->last_modified) >= MODIFF)) { int opoint = PT, opoint_byte = PT_BYTE; - TEMP_SET_PT_BOTH (XMARKER (w->start)->charpos, - XMARKER (w->start)->bytepos); + + /* In case W->start is out of the range, use something + reasonable. This situation occured when loading a file with + `-l' containing a call to `rmail' with subsequent other + commands. At the end, W->start happened to be BEG, while + rmail had already narrowed the buffer. This leads to an + abort in temp_set_pt_both. */ + if (XMARKER (w->start)->charpos < BEGV) + TEMP_SET_PT_BOTH (BEGV, BEGV_BYTE); + else if (XMARKER (w->start)->charpos > ZV) + TEMP_SET_PT_BOTH (ZV, ZV_BYTE); + else + TEMP_SET_PT_BOTH (XMARKER (w->start)->charpos, + XMARKER (w->start)->bytepos); + Fvertical_motion (make_number (window_internal_height (w)), Qnil); XSETINT (value, PT); TEMP_SET_PT_BOTH (opoint, opoint_byte);