Mercurial > emacs
diff src/lread.c @ 90796:4ef881a120fe
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 675-697)
- Update from CVS
- Merge from gnus--rel--5.10
- Release ERC 5.2.
* gnus--rel--5.10 (patch 211-215)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-189
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 11 Apr 2007 00:17:47 +0000 |
| parents | c0409ee15cee 846cbca78bc8 |
| children | e33fffaa9534 |
line wrap: on
line diff
--- a/src/lread.c Fri Mar 30 02:06:58 2007 +0000 +++ b/src/lread.c Wed Apr 11 00:17:47 2007 +0000 @@ -498,20 +498,21 @@ BLOCK_INPUT; c = getc (instream); - UNBLOCK_INPUT; #ifdef EINTR /* Interrupted reads have been observed while reading over the network */ while (c == EOF && ferror (instream) && errno == EINTR) { + UNBLOCK_INPUT; QUIT; - clearerr (instream); BLOCK_INPUT; + clearerr (instream); c = getc (instream); - UNBLOCK_INPUT; } #endif + UNBLOCK_INPUT; + return (c == EOF ? -1 : c); }
