* 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).

3 files changed, 9 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b2a200e3147..e0aa1ed577f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 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):
         * intervals.c (set_point_from_marker):
         * print.c (PRINTPREPARE): Prefer signal_error
diff --git a/src/buffer.c b/src/buffer.c
index c811890aefe..0bcb608dbd3 100644
--- 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 a751a73ae50..0e6113f349d 100644
--- 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));
 }