2 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d09fab7ca85..ecac971be19 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * insdel.c (prepare_to_modify_buffer): Don't set
+        saved-region-selection if modification hooks are disabled.
+
 2010-10-19  Chong Yidong  <cyd@stupidchicken.com>
 
         * cmds.c (Fdelete_char): Doc fix.
diff --git a/src/insdel.c b/src/insdel.c
index abe6f350585..ff380ada192 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -2051,6 +2051,7 @@ 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)
+      && !inhibit_modification_hooks
       && XMARKER (current_buffer->mark)->buffer
       && NILP (Vsaved_region_selection)
       && (EQ (Vselect_active_regions, Qonly)