mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-30 00:51:50 -08:00
* src/fileio.c (Finsert_file_contents): Add missing gcpro1 variable.
Suggested by Dmitry Antipov <dmantipov@yandex.ru>.
This commit is contained in:
parent
bac7ff225f
commit
a5bb9bd3a8
2 changed files with 8 additions and 2 deletions
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue