* buffer.c (drop_overlay):

* fileio.c (restore_point_unwind): Prefer unchain_marker to
Fset_marker (X, Qnil, ...) (which is the same but a bit slower).

diff --git a/src/ChangeLog b/src/ChangeLog
index b2a200e3147a0141443b796580e98cf48db46363..e0aa1ed577f70801eadf73a1ae9a7f2e4fa0af9a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-03  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * buffer.c (drop_overlay):
+       * fileio.c (restore_point_unwind): Prefer unchain_marker to
+       Fset_marker (X, Qnil, ...) (which is the same but a bit slower).
+
 2013-09-03  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * buffer.c (Fmake_overlay, Fmove_overlay):

diff --git a/src/buffer.c b/src/buffer.c
index c811890aefee8b0a534e6111ea7bdc40aa8325d0..0bcb608dbd39305e88fd99687c619463c6a73c4e 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -888,8 +888,8 @@ drop_overlay (struct buffer *b, struct Lisp_Overlay *ov)
   eassert (b == XBUFFER (Fmarker_buffer (ov->start)));
   modify_overlay (b, marker_position (ov->start),
                  marker_position (ov->end));
-  Fset_marker (ov->start, Qnil, Qnil);
-  Fset_marker (ov->end, Qnil, Qnil);
+  unchain_marker (XMARKER (ov->start));
+  unchain_marker (XMARKER (ov->end));
 
 }
 

diff --git a/src/fileio.c b/src/fileio.c
index a751a73ae5044c858b6c082464f0c0e50873f607..0e6113f349d3d5a3682a2dea4a22b6ed74b0a6e8 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -233,7 +233,7 @@ void
 restore_point_unwind (Lisp_Object location)
 {
   Fgoto_char (location);
-  Fset_marker (location, Qnil, Qnil);
+  unchain_marker (XMARKER (location));
 }
 
 \f