2 files changed, 16 insertions, 17 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c76838a2811..0b043a00112 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2013-08-02  Dmitry Antipov  <dmantipov@yandex.ru>
 
+        * insdel.c (adjust_after_replace, replace_range, del_range_2):
+        Do not check whether undo is enabled because record_insert and
+        record_delete does that themselves.
+
+2013-08-02  Dmitry Antipov  <dmantipov@yandex.ru>
+
         * xterm.h (struct x_output) [HAVE_X_I18N]: Remove xic_base_fontname
         member which is not really used any more.
         (FRAME_XIC_BASE_FONTNAME): Remove.
diff --git a/src/insdel.c b/src/insdel.c
index 15d585568a0..6b0aa9db3e3 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -1211,12 +1211,9 @@ adjust_after_replace (ptrdiff_t from, ptrdiff_t from_byte,
     adjust_markers_for_insert (from, from_byte,
                                from + len, from_byte + len_byte, 0);
 
-  if (! EQ (BVAR (current_buffer, undo_list), Qt))
-    {
-      if (nchars_del > 0)
-        record_delete (from, prev_text);
-      record_insert (from, len);
-    }
+  if (nchars_del > 0)
+    record_delete (from, prev_text);
+  record_insert (from, len);
 
   if (len > nchars_del)
     adjust_overlays_for_insert (from, len - nchars_del);
@@ -1373,15 +1370,12 @@ replace_range (ptrdiff_t from, ptrdiff_t to, Lisp_Object new,
     emacs_abort ();
 #endif
 
-  if (! EQ (BVAR (current_buffer, undo_list), Qt))
-    {
-      /* Record the insertion first, so that when we undo,
-         the deletion will be undone first.  Thus, undo
-         will insert before deleting, and thus will keep
-         the markers before and after this text separate.  */
-      record_insert (from + SCHARS (deletion), inschars);
-      record_delete (from, deletion);
-    }
+  /* Record the insertion first, so that when we undo,
+     the deletion will be undone first.  Thus, undo
+     will insert before deleting, and thus will keep
+     the markers before and after this text separate.  */
+  record_insert (from + SCHARS (deletion), inschars);
+  record_delete (from, deletion);
 
   GAP_SIZE -= outgoing_insbytes;
   GPT += inschars;
@@ -1718,8 +1712,7 @@ del_range_2 (ptrdiff_t from, ptrdiff_t from_byte,
      so that undo handles this after reinserting the text.  */
   adjust_markers_for_delete (from, from_byte, to, to_byte);
 
-  if (! EQ (BVAR (current_buffer, undo_list), Qt))
-    record_delete (from, deletion);
+  record_delete (from, deletion);
   MODIFF++;
   CHARS_MODIFF = MODIFF;