diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-11-19 23:34:32 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-11-19 23:34:32 -0500 |
| commit | a5bb9bd3a83d7a357b5e2ca0929efcb420197268 (patch) | |
| tree | c6054f385291f94bfe8b0e54d0f821ea0e71dc57 | |
| parent | bac7ff225f427ac2db9465363abc5010750e2e2d (diff) | |
| download | emacs-a5bb9bd3a83d7a357b5e2ca0929efcb420197268.tar.gz | |
* src/fileio.c (Finsert_file_contents): Add missing gcpro1 variable.
Suggested by Dmitry Antipov <dmantipov@yandex.ru>.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/fileio.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6cb461b0ea1..857fe6eaaaf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-11-20 Stefan Monnier <monnier@iro.umontreal.ca> + + * fileio.c (Finsert_file_contents): Add missing gcpro1 variable. + Suggested by Dmitry Antipov <dmantipov@yandex.ru>. + 2011-11-20 Juanma Barranquero <lekktu@gmail.com> * casetab.c (Fset_case_table): 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/>. */ #ifdef DOS_NT /* On Windows, drive letters must be alphabetic - on DOS, the Netware - redirector allows the six letters between 'Z' and 'a' as well. */ + redirector allows the six letters between 'Z' and 'a' as well. */ #ifdef MSDOS #define IS_DRIVE(x) ((x) >= 'A' && (x) <= 'z') #endif @@ -3686,6 +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; conversion_buffer = code_conversion_save (1, multibyte); @@ -3706,7 +3707,7 @@ variable `last-coding-system-used' to the coding system actually used. */) { /* We read one bunch by one (READ_BUF_SIZE bytes) to allow quitting while reading a huge while. */ - /* try is reserved in some compilers (Microsoft C) */ + /* `try'' is reserved in some compilers (Microsoft C). */ EMACS_INT trytry = min (total - how_much, READ_BUF_SIZE - unprocessed); |