* src/insdel.c (prepare_to_modify_buffer): Ensure the mark marker is alive

before using it (Bug#6977).

diff --git a/src/ChangeLog b/src/ChangeLog
index 38b24f8559b67200074e5955be6f2609913f9775..29071a36b0e716659815bf59a535c525044e4f90 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-25  Chong Yidong  <cyd@stupidchicken.com>
+
+       * insdel.c (prepare_to_modify_buffer): Ensure the mark marker is
+       alive before using it (Bug#6977).
+
 2010-09-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * xdisp.c (face_before_or_after_it_pos): EMACS_INT/int fixup.

diff --git a/src/insdel.c b/src/insdel.c
index fb26fe77ac2be33af88878cbd0d7df9de62839e2..abe6f3505852d7754e8bda1ca60ecceff3187aa6 100644 (file)
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -2051,13 +2051,14 @@ prepare_to_modify_buffer (EMACS_INT start, EMACS_INT end,
 
   /* If `select-active-regions' is non-nil, save the region text.  */
   if (!NILP (current_buffer->mark_active)
+      && XMARKER (current_buffer->mark)->buffer
       && NILP (Vsaved_region_selection)
       && (EQ (Vselect_active_regions, Qonly)
          ? EQ (CAR_SAFE (Vtransient_mark_mode), Qonly)
          : (!NILP (Vselect_active_regions)
             && !NILP (Vtransient_mark_mode))))
     {
-      EMACS_INT b = XINT (Fmarker_position (current_buffer->mark));
+      EMACS_INT b = XMARKER (current_buffer->mark)->charpos;
       EMACS_INT e = PT;
       if (b < e)
        Vsaved_region_selection = make_buffer_string (b, e, 0);