mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-11 14:01:43 -08:00
Code Issues Projects Releases Wiki Activity

Avoid aborts when buffer is modified during its redisplay

Browse source 
* src/xdisp.c (redisplay_window): Restore point from saved byte
position only if the buffer was not changed meanwhile.
(Bug#72165)
This commit is contained in:
Eli Zaretskii 2024-08-01 14:01:17 +03:00
parent cb421286d2
commit ef5466c267
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/xdisp.c
View file

@ -19957,6 +19957,7 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
int frame_line_height, margin;
bool use_desired_matrix;
void *itdata = NULL;
modiff_count lchars_modiff = CHARS_MODIFF, ochars_modiff = lchars_modiff;
SET_TEXT_POS (lpoint, PT, PT_BYTE);
opoint = lpoint;
@ -20050,6 +20051,7 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
end_unchanged = END_UNCHANGED;
SET_TEXT_POS (opoint, PT, PT_BYTE);
ochars_modiff = CHARS_MODIFF;
specbind (Qinhibit_point_motion_hooks, Qt);
@ -21082,14 +21084,28 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
TEMP_SET_PT_BOTH (BEGV, BEGV_BYTE);
else if (CHARPOS (opoint) > ZV)
TEMP_SET_PT_BOTH (Z, Z_BYTE);
else
else if (ochars_modiff == CHARS_MODIFF)
TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint));
else
{
/* If the buffer was modified while we were redisplaying it, we
cannot trust the correspondence between character and byte
positions. This can happen, for example, if we are
redisplaying *Messages* and some Lisp, perhaps invoked by
display_mode_lines, signals an error which caused something
added/deleted to/from the buffer text. */
TEMP_SET_PT_BOTH (CHARPOS (opoint), CHAR_TO_BYTE (CHARPOS (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));
{
if (lchars_modiff == CHARS_MODIFF)
TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint));
else
TEMP_SET_PT_BOTH (CHARPOS (lpoint), CHAR_TO_BYTE (CHARPOS (lpoint)));
}
unbind_to (count, Qnil);
}