procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
See <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
This commit is contained in:
Paul Eggert 2011-11-26 13:40:41 -08:00
parent 579ebf8ff0
commit 83aca1cb69
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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.

4
src/fileio.c
View file

@ -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