From 612a65d90cc98c5f4a1e849629ddc2a7bb0fbd67 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Wed, 6 Mar 2019 10:20:48 +0100 Subject: [PATCH] In unwind_with_echo_area_buffer use set_marker_restricted_both * src/xdisp.c (unwind_with_echo_area_buffer): Use set_marker_restricted_both instead of set_marker_both to avoid spurious assertion failures. --- src/xdisp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index ffab1ded4a5..6ceb5c9e51a 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -11035,15 +11035,15 @@ unwind_with_echo_area_buffer (Lisp_Object vector) buffer = AREF (vector, 4); wset_buffer (w, buffer); - set_marker_both (w->pointm, buffer, - XFIXNAT (AREF (vector, 5)), - XFIXNAT (AREF (vector, 6))); - set_marker_both (w->old_pointm, buffer, - XFIXNAT (AREF (vector, 7)), - XFIXNAT (AREF (vector, 8))); - set_marker_both (w->start, buffer, - XFIXNAT (AREF (vector, 9)), - XFIXNAT (AREF (vector, 10))); + set_marker_restricted_both (w->pointm, buffer, + XFIXNAT (AREF (vector, 5)), + XFIXNAT (AREF (vector, 6))); + set_marker_restricted_both (w->old_pointm, buffer, + XFIXNAT (AREF (vector, 7)), + XFIXNAT (AREF (vector, 8))); + set_marker_restricted_both (w->start, buffer, + XFIXNAT (AREF (vector, 9)), + XFIXNAT (AREF (vector, 10))); } Vwith_echo_area_save_vector = vector; -- 2.39.2