[Emacs-diffs] Changes to emacs/src/coding.c

[Richard M. Stallman]

Index: emacs/src/coding.c
diff -c emacs/src/coding.c:1.237 emacs/src/coding.c:1.238
*** emacs/src/coding.c:1.237    Mon Dec 17 10:33:12 2001
--- emacs/src/coding.c  Fri Jan 11 16:27:54 2002
***************
*** 5305,5310 ****
--- 5305,5311 ----
       struct coding_system *coding;
  {
    int len = to - from, len_byte = to_byte - from_byte;
+   int nchars_del = 0, nbytes_del = 0;
    int require, inserted, inserted_byte;
    int head_skip, tail_skip, total_skip = 0;
    Lisp_Object saved_coding_symbol;
***************
*** 5427,5433 ****
      }
  
    if (replace)
!     deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
  
    if (coding->composing != COMPOSITION_DISABLED)
      {
--- 5428,5442 ----
      }
  
    if (replace)
!     {
!       if (! EQ (current_buffer->undo_list, Qt))
!       deletion = make_buffer_string_both (from, from_byte, to, to_byte, 1);
!       else
!       {
!         nchars_del = to - from;
!         nbytes_del = to_byte - from_byte;
!       }
!     }
  
    if (coding->composing != COMPOSITION_DISABLED)
      {
***************
*** 5719,5725 ****
      }
  
    prev_Z = Z;
!   adjust_after_replace (from, from_byte, deletion, inserted, inserted_byte);
    inserted = Z - prev_Z;
  
    if (!encodep && coding->cmp_data && coding->cmp_data->used)
--- 5728,5738 ----
      }
  
    prev_Z = Z;
!   if (! EQ (current_buffer->undo_list, Qt))
!     adjust_after_replace (from, from_byte, deletion, inserted, inserted_byte);
!   else
!     adjust_after_replace_noundo (from, from_byte, nchars_del, nbytes_del,
!                                inserted, inserted_byte);
    inserted = Z - prev_Z;
  
    if (!encodep && coding->cmp_data && coding->cmp_data->used)