1--- src/xdisp.c	2007/07/28 01:12:44	1.1159
2+++ src/xdisp.c	2007/08/06 17:25:30	1.1160
3@@ -13520,7 +13520,10 @@
4   /* Restore current_buffer and value of point in it.  */
5   TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint));
6   set_buffer_internal_1 (old);
7-  TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint));
8+  /* Avoid an abort in TEMP_SET_PT_BOTH if the buffer has become
9+     shorter.  This can be caused by log truncation in *Messages*. */
10+  if (CHARPOS (lpoint) <= ZV)
11+    TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint));
12 
13   unbind_to (count, Qnil);
14 }
15