diff options
| author | Kenichi Handa | 2006-05-11 04:13:33 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-05-11 04:13:33 +0000 |
| commit | 17ad716ac4743dc7d46a0c5332129c17d91a9807 (patch) | |
| tree | e98a62fbbbb635dc9834fe208e631631d62c3e04 /src | |
| parent | e4c068c0634ea217e7389c3729101a2f1d09e0b3 (diff) | |
| download | emacs-17ad716ac4743dc7d46a0c5332129c17d91a9807.tar.gz emacs-17ad716ac4743dc7d46a0c5332129c17d91a9807.zip | |
(Finsert_file_contents): Fix for the case of IO error
while handling replace operation.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/fileio.c | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index afaa1c3af67..8f27f48ba55 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-05-11 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * fileio.c (Finsert_file_contents): Fix for the case of IO error | ||
| 4 | while handling replace operation. | ||
| 5 | |||
| 1 | 2006-05-10 Kenichi Handa <handa@m17n.org> | 6 | 2006-05-10 Kenichi Handa <handa@m17n.org> |
| 2 | 7 | ||
| 3 | * xfaces.c (realize_default_face) [HAVE_X_WINDOWS]: If the font | 8 | * xfaces.c (realize_default_face) [HAVE_X_WINDOWS]: If the font |
diff --git a/src/fileio.c b/src/fileio.c index 422f9d8dfc9..12ce3c411e8 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -4325,11 +4325,8 @@ actually used. */) | |||
| 4325 | { | 4325 | { |
| 4326 | xfree (conversion_buffer); | 4326 | xfree (conversion_buffer); |
| 4327 | coding_free_composition_data (&coding); | 4327 | coding_free_composition_data (&coding); |
| 4328 | if (how_much == -1) | 4328 | error ("IO error reading %s: %s", |
| 4329 | error ("IO error reading %s: %s", | 4329 | SDATA (orig_filename), emacs_strerror (errno)); |
| 4330 | SDATA (orig_filename), emacs_strerror (errno)); | ||
| 4331 | else if (how_much == -2) | ||
| 4332 | error ("maximum buffer size exceeded"); | ||
| 4333 | } | 4330 | } |
| 4334 | 4331 | ||
| 4335 | /* Compare the beginning of the converted file | 4332 | /* Compare the beginning of the converted file |