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

[Kenichi Handa]

Index: emacs/src/fileio.c
diff -c emacs/src/fileio.c:1.482 emacs/src/fileio.c:1.483
*** emacs/src/fileio.c:1.482    Thu Apr 10 08:01:10 2003
--- emacs/src/fileio.c  Fri Apr 11 06:59:02 2003
***************
*** 177,185 ****
  /* Functions to be called to process text properties in inserted file.  */
  Lisp_Object Vafter_insert_file_functions;
  
! /* Function to be called to adjust buffer-file-coding-system and the
     multibyteness of the current buffer after inserting a file.  */
! Lisp_Object Vafter_insert_file_adjust_coding_function;
  
  /* Functions to be called to create text property annotations for file.  */
  Lisp_Object Vwrite_region_annotate_functions;
--- 177,185 ----
  /* Functions to be called to process text properties in inserted file.  */
  Lisp_Object Vafter_insert_file_functions;
  
! /* Lisp function for setting buffer-file-coding-system and the
     multibyteness of the current buffer after inserting a file.  */
! Lisp_Object Qafter_insert_file_set_coding;
  
  /* Functions to be called to create text property annotations for file.  */
  Lisp_Object Vwrite_region_annotate_functions;
***************
*** 4547,4556 ****
    if (set_coding_system)
      Vlast_coding_system_used = coding.symbol;
  
!   if (FUNCTIONP (Vafter_insert_file_adjust_coding_function))
      {
!       insval = call1 (Vafter_insert_file_adjust_coding_function,
!                     make_number (inserted));
        if (! NILP (insval))
        {
          CHECK_NUMBER (insval);
--- 4547,4555 ----
    if (set_coding_system)
      Vlast_coding_system_used = coding.symbol;
  
!   if (! NILP (Ffboundp (Qafter_insert_file_set_coding)))
      {
!       insval = call1 (Qafter_insert_file_set_coding, make_number (inserted));
        if (! NILP (insval))
        {
          CHECK_NUMBER (insval);
***************
*** 6359,6364 ****
--- 6358,6365 ----
    staticpro (&Qformat_decode);
    Qformat_annotate_function = intern ("format-annotate-function");
    staticpro (&Qformat_annotate_function);
+   Qafter_insert_file_set_coding = intern ("after-insert-file-set-coding");
+   staticpro (&Qafter_insert_file_set_coding);
  
    Qcar_less_than_car = intern ("car-less-than-car");
    staticpro (&Qcar_less_than_car);
***************
*** 6428,6441 ****
        -*- ... coding: CODING-SYSTEM; ... -*-
  or local variable spec of the tailing lines with `coding:' tag.  */);
    Vset_auto_coding_function = Qnil;
- 
-   DEFVAR_LISP ("after-insert-file-adjust-coding-function",
-              &Vafter_insert_file_adjust_coding_function,
-              doc: /* Function to call to adjust buffer-file-coding-system 
after inserting a file.
- The function is called with one arguemnt, the number of characters inserted.
- It should adjust `buffer-file-coding-system' and the multibyteness of
- the current buffer, and return the new character count.  */);
-   Vafter_insert_file_adjust_coding_function = Qnil;
  
    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'.
--- 6429,6434 ----