[Emacs-diffs] Changes to emacs/src/xdisp.c,v [EMACS_22_BASE]

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Chong Yidong <cyd>      07/08/06 17:23:04

Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1149.2.6
retrieving revision 1.1149.2.7
diff -u -b -r1.1149.2.6 -r1.1149.2.7
--- xdisp.c     25 Jul 2007 05:15:20 -0000      1.1149.2.6
+++ xdisp.c     6 Aug 2007 17:23:03 -0000       1.1149.2.7
@@ -13520,6 +13520,9 @@
   /* Restore current_buffer and value of point in it.  */
   TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint));
   set_buffer_internal_1 (old);
+  /* 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);