[Emacs-diffs] /srv/bzr/emacs/trunk r100461: Fix redisplay crash (Bug#6177).

[Chong Yidong]

------------------------------------------------------------
revno: 100461
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-27 11:49:01 -0400
message:
  Fix redisplay crash (Bug#6177).
  
  * xdisp.c (redisplay_window): After redisplay, check if point is
  still valid before setting it (Bug#6177).
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-27 05:43:27 +0000
+++ b/src/ChangeLog     2010-05-27 15:49:01 +0000
@@ -1,3 +1,8 @@
+2010-05-27  Chong Yidong  <address@hidden>
+
+       * xdisp.c (redisplay_window): After redisplay, check if point is
+       still valid before setting it (Bug#6177).
+
 2010-05-27  Glenn Morris  <address@hidden>
 
        * Makefile.in, autodeps.mk, deps.mk, ns.mk:

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2010-05-25 00:35:50 +0000
+++ b/src/xdisp.c       2010-05-27 15:49:01 +0000
@@ -14788,8 +14788,16 @@
         (*FRAME_TERMINAL (f)->redeem_scroll_bar_hook) (w);
     }
 
-  /* Restore current_buffer and value of point in it.  */
-  TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint));
+  /* Restore current_buffer and value of point in it.  The window
+     update may have changed the buffer, so first make sure `opoint'
+     is still valid (Bug#6177).  */
+  if (CHARPOS (opoint) < BEGV)
+    TEMP_SET_PT_BOTH (BEGV, BEGV_BYTE);
+  else if (CHARPOS (opoint) > ZV)
+    TEMP_SET_PT_BOTH (Z, Z_BYTE);
+  else
+    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*. */