aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2019-03-06 10:20:48 +0100
committerMartin Rudalics2019-03-06 10:20:48 +0100
commit612a65d90cc98c5f4a1e849629ddc2a7bb0fbd67 (patch)
treece79aaeada26e4818080dcda051455d161a7b820 /src
parentb079cfa8461ba890285268962715eef07a10eae3 (diff)
downloademacs-612a65d90cc98c5f4a1e849629ddc2a7bb0fbd67.tar.gz
emacs-612a65d90cc98c5f4a1e849629ddc2a7bb0fbd67.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c18
1 files 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)
11035 buffer = AREF (vector, 4); 11035 buffer = AREF (vector, 4);
11036 11036
11037 wset_buffer (w, buffer); 11037 wset_buffer (w, buffer);
11038 set_marker_both (w->pointm, buffer, 11038 set_marker_restricted_both (w->pointm, buffer,
11039 XFIXNAT (AREF (vector, 5)), 11039 XFIXNAT (AREF (vector, 5)),
11040 XFIXNAT (AREF (vector, 6))); 11040 XFIXNAT (AREF (vector, 6)));
11041 set_marker_both (w->old_pointm, buffer, 11041 set_marker_restricted_both (w->old_pointm, buffer,
11042 XFIXNAT (AREF (vector, 7)), 11042 XFIXNAT (AREF (vector, 7)),
11043 XFIXNAT (AREF (vector, 8))); 11043 XFIXNAT (AREF (vector, 8)));
11044 set_marker_both (w->start, buffer, 11044 set_marker_restricted_both (w->start, buffer,
11045 XFIXNAT (AREF (vector, 9)), 11045 XFIXNAT (AREF (vector, 9)),
11046 XFIXNAT (AREF (vector, 10))); 11046 XFIXNAT (AREF (vector, 10)));
11047 } 11047 }
11048 11048
11049 Vwith_echo_area_save_vector = vector; 11049 Vwith_echo_area_save_vector = vector;