[Emacs-diffs] /srv/bzr/emacs/trunk r106443: * src/fileio.c (Finsert_file_contents): Add missing gcpro1 variable.

[Stefan Monnier]

------------------------------------------------------------
revno: 106443
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sat 2011-11-19 23:34:32 -0500
message:
  * src/fileio.c (Finsert_file_contents): Add missing gcpro1 variable.
  Suggested by Dmitry Antipov <address@hidden>.
modified:
  src/ChangeLog
  src/fileio.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-20 03:48:53 +0000
+++ b/src/ChangeLog     2011-11-20 04:34:32 +0000
@@ -1,3 +1,8 @@
+2011-11-20  Stefan Monnier  <address@hidden>
+
+       * fileio.c (Finsert_file_contents): Add missing gcpro1 variable.
+       Suggested by Dmitry Antipov <address@hidden>.
+
 2011-11-20  Juanma Barranquero  <address@hidden>
 
        * casetab.c (Fset_case_table):

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2011-11-20 02:29:42 +0000
+++ b/src/fileio.c      2011-11-20 04:34:32 +0000
@@ -62,7 +62,7 @@
 
 #ifdef DOS_NT
 /* On Windows, drive letters must be alphabetic - on DOS, the Netware
-   redirector allows the six letters between 'Z' and 'a' as well. */
+   redirector allows the six letters between 'Z' and 'a' as well.  */
 #ifdef MSDOS
 #define IS_DRIVE(x) ((x) >= 'A' && (x) <= 'z')
 #endif
@@ -3686,6 +3686,7 @@
       int this_count = SPECPDL_INDEX ();
       int multibyte = ! NILP (BVAR (current_buffer, 
enable_multibyte_characters));
       Lisp_Object conversion_buffer;
+      struct gcpro gcpro1;
 
       conversion_buffer = code_conversion_save (1, multibyte);
 
@@ -3706,7 +3707,7 @@
        {
          /* We read one bunch by one (READ_BUF_SIZE bytes) to allow
             quitting while reading a huge while.  */
-         /* try is reserved in some compilers (Microsoft C) */
+         /* `try'' is reserved in some compilers (Microsoft C).  */
          EMACS_INT trytry = min (total - how_much,
                                  READ_BUF_SIZE - unprocessed);