Commit d24ec09a authored by Chong Yidong's avatar Chong Yidong

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

before using it (Bug#6977).
parent 565c0ca5
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.
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment