diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-02 17:32:10 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-02 17:32:10 -0700 |
| commit | 43aae36e04fe151c73525ed7f8f55890dced98ae (patch) | |
| tree | a94e3f57460406bfee438c96cc3c2e5ea18a9596 /src/fileio.c | |
| parent | 163c5f3291530e9c2fc7487ed11a8127c6c70b5a (diff) | |
| download | emacs-43aae36e04fe151c73525ed7f8f55890dced98ae.tar.gz emacs-43aae36e04fe151c73525ed7f8f55890dced98ae.tar.bz2 emacs-43aae36e04fe151c73525ed7f8f55890dced98ae.zip | |
* fileio.c (Finsert_file_contents): Make EOF condition clearer.
Diffstat (limited to 'src/fileio.c')
| -rw-r--r-- | src/fileio.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/fileio.c b/src/fileio.c index 18aaf4562da..dec53968947 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -3607,6 +3607,7 @@ variable `last-coding-system-used' to the coding system actually used. */) EMACS_INT bufpos; unsigned char *decoded; EMACS_INT temp; + EMACS_INT this = 0; int this_count = SPECPDL_INDEX (); int multibyte = ! NILP (BVAR (current_buffer, enable_multibyte_characters)); Lisp_Object conversion_buffer; @@ -3633,7 +3634,6 @@ variable `last-coding-system-used' to the coding system actually used. */) /* try is reserved in some compilers (Microsoft C) */ EMACS_INT trytry = min (total - how_much, READ_BUF_SIZE - unprocessed); - EMACS_INT this; /* Allow quitting out of the actual I/O. */ immediate_quit = 1; @@ -3642,11 +3642,7 @@ variable `last-coding-system-used' to the coding system actually used. */) immediate_quit = 0; if (this <= 0) - { - if (this < 0) - how_much = this; - break; - } + break; how_much += this; @@ -3669,7 +3665,7 @@ variable `last-coding-system-used' to the coding system actually used. */) /* At this point, HOW_MUCH should equal TOTAL, or should be <= 0 if we couldn't read the file. */ - if (how_much < 0) + if (this < 0) error ("IO error reading %s: %s", SDATA (orig_filename), emacs_strerror (errno)); |