[Emacs-diffs] trunk r113650: * insdel.c (adjust_after_replace, replace_range, del_range_2):

[Dmitry Antipov]

------------------------------------------------------------
revno: 113650
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-08-02 11:07:08 +0400
message:
  * 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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/insdel.c                   insdel.c-20091113204419-o5vbwnq5f7feedwu-175

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-02 04:21:51 +0000
+++ b/src/ChangeLog     2013-08-02 07:07:08 +0000
@@ -1,5 +1,11 @@
 2013-08-02  Dmitry Antipov  <address@hidden>
 
+       * 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  <address@hidden>
+
        * 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.

=== modified file 'src/insdel.c'
--- a/src/insdel.c      2013-07-16 21:35:45 +0000
+++ b/src/insdel.c      2013-08-02 07:07:08 +0000
@@ -1211,12 +1211,9 @@
     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 @@
     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 @@
      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;