merge from upstream

1 files changed, 4 insertions, 0 deletions

diff --git a/src/fileio.c b/src/fileio.c
index 27fef42960a..c6f8dfe4683 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1755,6 +1755,10 @@ barf_or_query_if_file_exists (Lisp_Object absname, const char *querystring,
      regardless of what access permissions it has.  */
   if (lstat (SSDATA (encoded_filename), &statbuf) >= 0)
     {
+      if (S_ISDIR (statbuf.st_mode))
+        xsignal2 (Qfile_error,
+                  build_string ("File is a directory"), absname);
+
       if (! interactive)
         xsignal2 (Qfile_already_exists,
                   build_string ("File already exists"), absname);