aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-04 16:34:31 +0200
committerLars Magne Ingebrigtsen2011-07-04 16:34:31 +0200
commitad63790719a974b50ef4abfbe886a35bc61d647e (patch)
tree7f3eca3d7423dc3404d738172e4f9ef2af952a3b /src
parentc4f2d8d48d29b35ba5f0d7734be8e8b0b8b71798 (diff)
downloademacs-ad63790719a974b50ef4abfbe886a35bc61d647e.tar.gz
emacs-ad63790719a974b50ef4abfbe886a35bc61d647e.zip
(barf_or_query_if_file_exists): Make the "File is a directory"
error be more correct.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/fileio.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1be9b09381e..4e2658f2c1e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,8 @@
3 * fileio.c (barf_or_query_if_file_exists): Check first if the file 3 * fileio.c (barf_or_query_if_file_exists): Check first if the file
4 is a directory before asking whether to use the file name 4 is a directory before asking whether to use the file name
5 (bug#7564). 5 (bug#7564).
6 (barf_or_query_if_file_exists): Make the "File is a directory"
7 error be more correct.
6 8
7 * fns.c (Frequire): Remove the mention of the .gz files, since 9 * fns.c (Frequire): Remove the mention of the .gz files, since
8 that's installation-specific, but keep the mention of 10 that's installation-specific, but keep the mention of
diff --git a/src/fileio.c b/src/fileio.c
index 6a4d1c55680..68834d5b5ec 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1757,7 +1757,7 @@ barf_or_query_if_file_exists (Lisp_Object absname, const char *querystring,
1757 { 1757 {
1758 if (Ffile_directory_p (absname)) 1758 if (Ffile_directory_p (absname))
1759 xsignal2 (Qfile_error, 1759 xsignal2 (Qfile_error,
1760 build_string ("File name is a directory"), absname); 1760 build_string ("File is a directory"), absname);
1761 1761
1762 if (! interactive) 1762 if (! interactive)
1763 xsignal2 (Qfile_already_exists, 1763 xsignal2 (Qfile_already_exists,