procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Finsert_file_contents): If REPLACE is non-nil, stop

Browse source 
reading at EOF.
This commit is contained in:
Gerd Moellmann 2001-09-26 15:30:07 +00:00
parent b08bd2df8f
commit b02439c895
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2001-09-26 Gerd Moellmann <gerd@gnu.org>
* fileio.c (Finsert_file_contents): If REPLACE is non-nil, stop
reading at EOF.
* xdisp.c (with_echo_area_buffer): Use echo_kboard instead
of the only temporarily set echoing flag for deciding when
the cancel echoing.

5
src/fileio.c
View file

@ -3870,7 +3870,7 @@ actually used.")
report_file_error ("Setting file position",
Fcons (orig_filename, Qnil));
total_read = 0;
total_read = nread = 0;
while (total_read < trial)
{
nread = emacs_read (fd, buffer + total_read, trial - total_read);
@ -3905,6 +3905,9 @@ actually used.")
giveup_match_end = 1;
break;
}
if (nread == 0)
break;
}
immediate_quit = 0;