* fileio.c (Finsert_file_contents): Undo previous change.

See <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9097eab47a22fa407257b3ac4a1897e9306241c8..dd7b715e4433d71a9b76d32dd83d938195aa4a6c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * fileio.c (Finsert_file_contents): Undo previous change; see
+       <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
+
 2011-11-26  Paul Eggert  <eggert@cs.ucla.edu>
 
        Rename locals to avoid shadowing.

diff --git a/src/fileio.c b/src/fileio.c
index 009f35d2a7f7ebcaf4149557f745ce74646a42d8..5f7a8ad39726904b3e2e1e8f40706e30bb15793c 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3686,7 +3686,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
       int this_count = SPECPDL_INDEX ();
       int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters));
       Lisp_Object conversion_buffer;
-      struct gcpro inner_gcpro1;
+      struct gcpro gcpro1;
 
       conversion_buffer = code_conversion_save (1, multibyte);
 
@@ -3702,7 +3702,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
       inserted = 0;            /* Bytes put into CONVERSION_BUFFER so far.  */
       unprocessed = 0;         /* Bytes not processed in previous loop.  */
 
-      GCPRO1_VAR (conversion_buffer, inner_gcpro);
+      GCPRO1 (conversion_buffer);
       while (how_much < total)
        {
          /* We read one bunch by one (READ_BUF_SIZE bytes) to allow