Mercurial > emacs
changeset 108670:4236cb683dbb
* xdisp.c (redisplay_window): After redisplay, check if point is
still valid before setting it (Bug#6177).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 27 May 2010 11:42:50 -0400 |
| parents | c1945e85d4b9 |
| children | 1a054db83296 |
| files | src/ChangeLog src/xdisp.c |
| diffstat | 2 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu May 27 11:25:58 2010 -0400 +++ b/src/ChangeLog Thu May 27 11:42:50 2010 -0400 @@ -1,3 +1,8 @@ +2010-05-27 Chong Yidong <cyd@stupidchicken.com> + + * xdisp.c (redisplay_window): After redisplay, check if point is + still valid before setting it (Bug#6177). + 2010-05-20 enami tsugutomo <tsugutomo.enami@jp.sony.com> * s/netbsd.h: If terminfo is found, use it in preference to
--- a/src/xdisp.c Thu May 27 11:25:58 2010 -0400 +++ b/src/xdisp.c Thu May 27 11:42:50 2010 -0400 @@ -13936,8 +13936,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*. */