]> git.eshelyaron.com Git - emacs.git/commitdiff
In unwind_with_echo_area_buffer use set_marker_restricted_both
authorMartin Rudalics <rudalics@gmx.at>
Wed, 6 Mar 2019 09:20:48 +0000 (10:20 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Wed, 6 Mar 2019 09:20:48 +0000 (10:20 +0100)
* 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

index ffab1ded4a586b91aab1624e9c018893a787785f..6ceb5c9e51aa8cc2b3941f27693b2a7ef54c7703 100644 (file)
@@ -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;