diff options
| author | Stefan Monnier | 2011-11-19 23:34:32 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2011-11-19 23:34:32 -0500 |
| commit | a5bb9bd3a83d7a357b5e2ca0929efcb420197268 (patch) | |
| tree | c6054f385291f94bfe8b0e54d0f821ea0e71dc57 /src/fileio.c | |
| parent | bac7ff225f427ac2db9465363abc5010750e2e2d (diff) | |
| download | emacs-a5bb9bd3a83d7a357b5e2ca0929efcb420197268.tar.gz emacs-a5bb9bd3a83d7a357b5e2ca0929efcb420197268.zip | |
* src/fileio.c (Finsert_file_contents): Add missing gcpro1 variable.
Suggested by Dmitry Antipov <dmantipov@yandex.ru>.
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c index e3586c50056..7e75e6285f0 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -62,7 +62,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 62 | 62 | ||
| 63 | #ifdef DOS_NT | 63 | #ifdef DOS_NT |
| 64 | /* On Windows, drive letters must be alphabetic - on DOS, the Netware | 64 | /* On Windows, drive letters must be alphabetic - on DOS, the Netware |
| 65 | redirector allows the six letters between 'Z' and 'a' as well. */ | 65 | redirector allows the six letters between 'Z' and 'a' as well. */ |
| 66 | #ifdef MSDOS | 66 | #ifdef MSDOS |
| 67 | #define IS_DRIVE(x) ((x) >= 'A' && (x) <= 'z') | 67 | #define IS_DRIVE(x) ((x) >= 'A' && (x) <= 'z') |
| 68 | #endif | 68 | #endif |
| @@ -3686,6 +3686,7 @@ variable `last-coding-system-used' to the coding system actually used. */) | |||
| 3686 | int this_count = SPECPDL_INDEX (); | 3686 | int this_count = SPECPDL_INDEX (); |
| 3687 | int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters)); | 3687 | int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters)); |
| 3688 | Lisp_Object conversion_buffer; | 3688 | Lisp_Object conversion_buffer; |
| 3689 | struct gcpro gcpro1; | ||
| 3689 | 3690 | ||
| 3690 | conversion_buffer = code_conversion_save (1, multibyte); | 3691 | conversion_buffer = code_conversion_save (1, multibyte); |
| 3691 | 3692 | ||
| @@ -3706,7 +3707,7 @@ variable `last-coding-system-used' to the coding system actually used. */) | |||
| 3706 | { | 3707 | { |
| 3707 | /* We read one bunch by one (READ_BUF_SIZE bytes) to allow | 3708 | /* We read one bunch by one (READ_BUF_SIZE bytes) to allow |
| 3708 | quitting while reading a huge while. */ | 3709 | quitting while reading a huge while. */ |
| 3709 | /* try is reserved in some compilers (Microsoft C) */ | 3710 | /* `try'' is reserved in some compilers (Microsoft C). */ |
| 3710 | EMACS_INT trytry = min (total - how_much, | 3711 | EMACS_INT trytry = min (total - how_much, |
| 3711 | READ_BUF_SIZE - unprocessed); | 3712 | READ_BUF_SIZE - unprocessed); |
| 3712 | 3713 | ||