[Emacs-diffs] /srv/bzr/emacs/trunk r106527: * fileio.c (Finsert_file_contents): Undo previous change.

[Paul Eggert]

------------------------------------------------------------
revno: 106527
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-11-26 13:40:41 -0800
message:
  * fileio.c (Finsert_file_contents): Undo previous change.
  
  See <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
modified:
  src/ChangeLog
  src/fileio.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-26 07:42:44 +0000
+++ b/src/ChangeLog     2011-11-26 21:40:41 +0000
@@ -1,5 +1,10 @@
 2011-11-26  Paul Eggert  <address@hidden>
 
+       * 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  <address@hidden>
+
        Rename locals to avoid shadowing.
        * fileio.c (Finsert_file_contents):
        Rename inner 'gcpro1' to 'inner_gcpro1' to avoid shadowing.

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2011-11-26 07:42:44 +0000
+++ b/src/fileio.c      2011-11-26 21:40:41 +0000
@@ -3686,7 +3686,7 @@
       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 @@
       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