From bee35e01be01846c4421c71d69bb1226c9dabfe6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 26 Nov 2011 13:40:41 -0800 Subject: * fileio.c (Finsert_file_contents): Undo previous change. See . --- src/ChangeLog | 5 +++++ src/fileio.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 16668357d03..43b693ea88c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-11-26 Paul Eggert + + * fileio.c (Finsert_file_contents): Undo previous change; see + . + 2011-11-26 Paul Eggert Rename locals to avoid shadowing. diff --git a/src/fileio.c b/src/fileio.c index 009f35d2a7f..5f7a8ad3972 100644 --- 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 -- cgit v1.2.1