aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2013-01-18 16:40:07 -0800
committerPaul Eggert2013-01-18 16:40:07 -0800
commitfa705c9927b57158e8973cd950419a2ac0f72c53 (patch)
treea6b838dadd8dbf226151a1071073de5e066c58b9
parentb117094709e34befa5a9486584f870d3e84d8f38 (diff)
downloademacs-fa705c9927b57158e8973cd950419a2ac0f72c53.tar.gz
emacs-fa705c9927b57158e8973cd950419a2ac0f72c53.zip
* fileio.c (Finsert_file_contents): Simplify new diagnostic
and make it more consistent with other stat-failure diagnostics.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/fileio.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a7b8ab7855b..4cd417868a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-01-19 Paul Eggert <eggert@cs.ucla.edu>
2
3 * fileio.c (Finsert_file_contents): Simplify new diagnostic
4 and make it more consistent with other stat-failure diagnostics.
5
12013-01-18 Dmitry Antipov <dmantipov@yandex.ru> 62013-01-18 Dmitry Antipov <dmantipov@yandex.ru>
2 7
3 Fix crash when inserting data from non-regular files. See 8 Fix crash when inserting data from non-regular files. See
diff --git a/src/fileio.c b/src/fileio.c
index 4c54fd822ae..bd845c2f1e0 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3574,8 +3574,7 @@ by calling `format-decode', which see. */)
3574 record_unwind_protect (close_file_unwind, make_number (fd)); 3574 record_unwind_protect (close_file_unwind, make_number (fd));
3575 3575
3576 if (fstat (fd, &st) != 0) 3576 if (fstat (fd, &st) != 0)
3577 report_file_error ("Getting input file status", 3577 report_file_error ("Input file status", Fcons (orig_filename, Qnil));
3578 Fcons (orig_filename, Qnil));
3579 mtime = get_stat_mtime (&st); 3578 mtime = get_stat_mtime (&st);
3580 3579
3581 /* This code will need to be changed in order to work on named 3580 /* This code will need to be changed in order to work on named