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

[Richard M. Stallman]

Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.479 emacs/src/fileio.c:1.480
*** emacs/src/fileio.c:1.479    Sat Mar 29 11:34:35 2003
--- emacs/src/fileio.c  Tue Apr  8 13:09:23 2003
***************
*** 3574,3580 ****
  DEFUN ("insert-file-contents", Finsert_file_contents, Sinsert_file_contents,
         1, 5, 0,
         doc: /* Insert contents of file FILENAME after point.
! Returns list of absolute file name and number of bytes inserted.
  If second argument VISIT is non-nil, the buffer's visited filename
  and last save file modtime are set, and it is marked unmodified.
  If visiting and the file does not exist, visiting is completed
--- 3574,3580 ----
  DEFUN ("insert-file-contents", Finsert_file_contents, Sinsert_file_contents,
         1, 5, 0,
         doc: /* Insert contents of file FILENAME after point.
! Returns list of absolute file name and number of characters inserted.
  If second argument VISIT is non-nil, the buffer's visited filename
  and last save file modtime are set, and it is marked unmodified.
  If visiting and the file does not exist, visiting is completed
***************
*** 4493,4498 ****
--- 4493,4500 ----
                             inserted);
      }
  
+   /* Now INSERTED is measured in characters.  */
+ 
  #ifdef DOS_NT
    /* Use the conversion type to determine buffer-file-type
       (find-buffer-file-type is now used to help determine the
***************
*** 6414,6423 ****
  
    DEFVAR_LISP ("after-insert-file-functions", &Vafter_insert_file_functions,
               doc: /* A list of functions to be called at the end of 
`insert-file-contents'.
! Each is passed one argument, the number of bytes inserted.  It should return
! the new byte count, and leave point the same.  If `insert-file-contents' is
! intercepted by a handler from `file-name-handler-alist', that handler is
! responsible for calling the after-insert-file-functions if appropriate.  */);
    Vafter_insert_file_functions = Qnil;
  
    DEFVAR_LISP ("write-region-annotate-functions", 
&Vwrite_region_annotate_functions,
--- 6416,6426 ----
  
    DEFVAR_LISP ("after-insert-file-functions", &Vafter_insert_file_functions,
               doc: /* A list of functions to be called at the end of 
`insert-file-contents'.
! Each is passed one argument, the number of characters inserted.
! It should return the new character count, and leave point the same.
! If `insert-file-contents' is intercepted by a handler from
! `file-name-handler-alist', that handler is responsible for calling the
! functions in `after-insert-file-functions' if appropriate.  */);
    Vafter_insert_file_functions = Qnil;
  
    DEFVAR_LISP ("write-region-annotate-functions", 
&Vwrite_region_annotate_functions,