From bc04f6bf4f2d77093b5a42f6f007b3474d86fb2d Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 6 Aug 2007 17:23:03 +0000 Subject: [PATCH] (redisplay_window): When restoring original buffer position, make sure it is still valid. --- src/xdisp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/xdisp.c b/src/xdisp.c index 46247beb10f..1dd69e34590 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -13520,7 +13520,10 @@ redisplay_window (window, just_this_one_p) /* Restore current_buffer and value of point in it. */ TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint)); set_buffer_internal_1 (old); - TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint)); + /* Avoid an abort in TEMP_SET_PT_BOTH if the buffer has become + shorter. This can be caused by log truncation in *Messages*. */ + if (CHARPOS (lpoint) <= ZV) + TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint)); unbind_to (count, Qnil); } -- 2.39.2