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

[Richard M. Stallman]

Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.446 emacs/src/fileio.c:1.447
*** emacs/src/fileio.c:1.446    Tue May 28 05:03:22 2002
--- emacs/src/fileio.c  Tue May 28 16:25:46 2002
***************
*** 4827,4837 ****
    count1 = specpdl_ptr - specpdl;
  
    given_buffer = current_buffer;
!   annotations = build_annotations (start, end);
!   if (current_buffer != given_buffer)
      {
!       XSETFASTINT (start, BEGV);
!       XSETFASTINT (end, ZV);
      }
  
    UNGCPRO;
--- 4827,4842 ----
    count1 = specpdl_ptr - specpdl;
  
    given_buffer = current_buffer;
! 
!   if (!STRINGP (start))
      {
!       annotations = build_annotations (start, end);
! 
!       if (current_buffer != given_buffer)
!       {
!         XSETFASTINT (start, BEGV);
!         XSETFASTINT (end, ZV);
!       }
      }
  
    UNGCPRO;
***************
*** 4847,4858 ****
    Vlast_coding_system_used = coding.symbol;
  
    given_buffer = current_buffer;
!   annotations = build_annotations_2 (start, end,
!                                    coding.pre_write_conversion, annotations);
!   if (current_buffer != given_buffer)
      {
!       XSETFASTINT (start, BEGV);
!       XSETFASTINT (end, ZV);
      }
  
  #ifdef CLASH_DETECTION
--- 4852,4866 ----
    Vlast_coding_system_used = coding.symbol;
  
    given_buffer = current_buffer;
!   if (! STRINGP (start))
      {
!       annotations = build_annotations_2 (start, end,
!                                        coding.pre_write_conversion, 
annotations);
!       if (current_buffer != given_buffer)
!       {
!         XSETFASTINT (start, BEGV);
!         XSETFASTINT (end, ZV);
!       }
      }
  
  #ifdef CLASH_DETECTION