diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-26 13:40:41 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-26 13:40:41 -0800 |
| commit | 83aca1cb6970314dcc6c35c1432ebcac42811926 (patch) | |
| tree | 7099a4f1bb9458efc80ce4721d5c746e7038c14e | |
| parent | 579ebf8ff0b7693754fb27bbea4fceb4410df0e8 (diff) | |
| download | emacs-83aca1cb6970314dcc6c35c1432ebcac42811926.tar.gz | |
* fileio.c (Finsert_file_contents): Undo previous change.
See <http://lists.gnu.org/archive/html/emacs-diffs/2011-11/msg00265.html>.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/fileio.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9097eab47a2..dd7b715e443 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 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. * fileio.c (Finsert_file_contents): Rename inner 'gcpro1' to 'inner_gcpro1' 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 |