summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
* fileio.c (barf_or_query_if_file_exists): Check first if the file
is a directory before asking whether to use the file name
(bug#7564).
+ (barf_or_query_if_file_exists): Make the "File is a directory"
+ error be more correct.
* fns.c (Frequire): Remove the mention of the .gz files, since
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,
{
if (Ffile_directory_p (absname))
xsignal2 (Qfile_error,
- build_string ("File name is a directory"), absname);
+ build_string ("File is a directory"), absname);
if (! interactive)
xsignal2 (Qfile_already_exists,