Commit b02439c8 authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

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

reading at EOF.
parent b08bd2df
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.
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment