(Vafter_insert_file_adjust_coding_function): Delete

this variable.
(Qafter_insert_file_set_coding): New variable.
(syms_of_fileio): Initialize and staticpro it.  Delete declaration
for after-insert-file-adjust-coding-function.
(Finsert_file_contents): Call Qafter_insert_file_set_coding
instead of Vafter_insert_file_adjust_coding_function.

diff --git a/src/fileio.c b/src/fileio.c
index e717e1281fec4bbc865b659acf5ba2aadab5069f..29367875ac4346c76ddddeab0b69d05d03362924 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -177,9 +177,9 @@ Lisp_Object Vset_auto_coding_function;
 /* 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
+/* Lisp function for setting buffer-file-coding-system and the
    multibyteness of the current buffer after inserting a file.  */
-Lisp_Object Vafter_insert_file_adjust_coding_function;
+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,10 +4547,9 @@ actually used.  */)
   if (set_coding_system)
     Vlast_coding_system_used = coding.symbol;
 
-  if (FUNCTIONP (Vafter_insert_file_adjust_coding_function))
+  if (! NILP (Ffboundp (Qafter_insert_file_set_coding)))
     {
-      insval = call1 (Vafter_insert_file_adjust_coding_function,
-                     make_number (inserted));
+      insval = call1 (Qafter_insert_file_set_coding, make_number (inserted));
       if (! NILP (insval))
        {
          CHECK_NUMBER (insval);
@@ -6359,6 +6358,8 @@ same format as a regular save would use.  */);
   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);
@@ -6429,14 +6430,6 @@ specified in the heading lines with the format:
 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'.
 Each is passed one argument, the number of characters inserted.