diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-25 23:42:44 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-25 23:42:44 -0800 |
| commit | 5b76caa476d552e204adc3c1bf4af8e401ec5d42 (patch) | |
| tree | f1ea7b28bd616eb17f6714af16a81429800479a5 /src/fileio.c | |
| parent | 78adbf9c3f71e4387d4b01697b76999c883735c4 (diff) | |
| download | emacs-5b76caa476d552e204adc3c1bf4af8e401ec5d42.tar.gz emacs-5b76caa476d552e204adc3c1bf4af8e401ec5d42.tar.bz2 emacs-5b76caa476d552e204adc3c1bf4af8e401ec5d42.zip | |
Rename locals to avoid shadowing.
* fileio.c (Finsert_file_contents):
Rename inner 'gcpro1' to 'inner_gcpro1' to avoid shadowing.
* process.c (wait_reading_process_output):
Rename inner 'proc' to 'p' to avoid shadowing.
Indent for consistency with usual Emacs style.
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c index 5f7a8ad3972..009f35d2a7f 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 gcpro1; + struct gcpro inner_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 (conversion_buffer); + GCPRO1_VAR (conversion_buffer, inner_gcpro); while (how_much < total) { /* We read one bunch by one (READ_BUF_SIZE bytes) to allow |