diff options
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lread.c b/src/lread.c index 08d5f97292b..cb808b37677 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -408,9 +408,9 @@ unreadchar (Lisp_Object readcharfun, int c) | |||
| 408 | { | 408 | { |
| 409 | if (load_each_byte) | 409 | if (load_each_byte) |
| 410 | { | 410 | { |
| 411 | BLOCK_INPUT; | 411 | block_input (); |
| 412 | ungetc (c, instream); | 412 | ungetc (c, instream); |
| 413 | UNBLOCK_INPUT; | 413 | unblock_input (); |
| 414 | } | 414 | } |
| 415 | else | 415 | else |
| 416 | unread_char = c; | 416 | unread_char = c; |
| @@ -431,28 +431,28 @@ readbyte_from_file (int c, Lisp_Object readcharfun) | |||
| 431 | { | 431 | { |
| 432 | if (c >= 0) | 432 | if (c >= 0) |
| 433 | { | 433 | { |
| 434 | BLOCK_INPUT; | 434 | block_input (); |
| 435 | ungetc (c, instream); | 435 | ungetc (c, instream); |
| 436 | UNBLOCK_INPUT; | 436 | unblock_input (); |
| 437 | return 0; | 437 | return 0; |
| 438 | } | 438 | } |
| 439 | 439 | ||
| 440 | BLOCK_INPUT; | 440 | block_input (); |
| 441 | c = getc (instream); | 441 | c = getc (instream); |
| 442 | 442 | ||
| 443 | #ifdef EINTR | 443 | #ifdef EINTR |
| 444 | /* Interrupted reads have been observed while reading over the network. */ | 444 | /* Interrupted reads have been observed while reading over the network. */ |
| 445 | while (c == EOF && ferror (instream) && errno == EINTR) | 445 | while (c == EOF && ferror (instream) && errno == EINTR) |
| 446 | { | 446 | { |
| 447 | UNBLOCK_INPUT; | 447 | unblock_input (); |
| 448 | QUIT; | 448 | QUIT; |
| 449 | BLOCK_INPUT; | 449 | block_input (); |
| 450 | clearerr (instream); | 450 | clearerr (instream); |
| 451 | c = getc (instream); | 451 | c = getc (instream); |
| 452 | } | 452 | } |
| 453 | #endif | 453 | #endif |
| 454 | 454 | ||
| 455 | UNBLOCK_INPUT; | 455 | unblock_input (); |
| 456 | 456 | ||
| 457 | return (c == EOF ? -1 : c); | 457 | return (c == EOF ? -1 : c); |
| 458 | } | 458 | } |
| @@ -753,9 +753,9 @@ DEFUN ("get-file-char", Fget_file_char, Sget_file_char, 0, 0, 0, | |||
| 753 | (void) | 753 | (void) |
| 754 | { | 754 | { |
| 755 | register Lisp_Object val; | 755 | register Lisp_Object val; |
| 756 | BLOCK_INPUT; | 756 | block_input (); |
| 757 | XSETINT (val, getc (instream)); | 757 | XSETINT (val, getc (instream)); |
| 758 | UNBLOCK_INPUT; | 758 | unblock_input (); |
| 759 | return val; | 759 | return val; |
| 760 | } | 760 | } |
| 761 | 761 | ||
| @@ -1350,9 +1350,9 @@ load_unwind (Lisp_Object arg) /* Used as unwind-protect function in load. */ | |||
| 1350 | FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; | 1350 | FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; |
| 1351 | if (stream != NULL) | 1351 | if (stream != NULL) |
| 1352 | { | 1352 | { |
| 1353 | BLOCK_INPUT; | 1353 | block_input (); |
| 1354 | fclose (stream); | 1354 | fclose (stream); |
| 1355 | UNBLOCK_INPUT; | 1355 | unblock_input (); |
| 1356 | } | 1356 | } |
| 1357 | return Qnil; | 1357 | return Qnil; |
| 1358 | } | 1358 | } |