# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1186420983 0
# Node ID 65b1a3eb58c438dc0ed68d56c90bd105604b4377
# Parent  fcb3df3845ab3aecc475a505bb3f2aa495764e1c
(redisplay_window): When restoring original buffer position, make sure
it is still valid.

diff -r fcb3df3845ab -r 65b1a3eb58c4 src/xdisp.c
--- a/src/xdisp.c	Mon Aug 06 17:22:44 2007 +0000
+++ b/src/xdisp.c	Mon Aug 06 17:23:03 2007 +0000
@@ -13520,7 +13520,10 @@
   /* 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);
 }