* src/fileio.c (Finsert_file_contents): Add missing gcpro1 variable.

Suggested by Dmitry Antipov <dmantipov@yandex.ru>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6cb461b0ea1ead1cdc18717c6d51eb771fe0b6b1..857fe6eaaaf726205521445b837099d1addfc084 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * fileio.c (Finsert_file_contents): Add missing gcpro1 variable.
+       Suggested by Dmitry Antipov <dmantipov@yandex.ru>.
+
 2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
 
        * casetab.c (Fset_case_table):

diff --git a/src/fileio.c b/src/fileio.c
index e3586c5005614e47ccc5979367d9cbfeccc064b2..7e75e6285f024a53c4414b0a380b0b41ba56e396 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -62,7 +62,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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 @@ 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 gcpro1;
 
       conversion_buffer = code_conversion_save (1, multibyte);
 
@@ -3706,7 +3707,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
        {
          /* 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);