[Emacs-diffs] Changes to emacs/lisp/files.el,v

[Martin Rudalics]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Martin Rudalics <m061211>       07/03/20 09:35:42

Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.889
retrieving revision 1.890
diff -u -b -r1.889 -r1.890
--- files.el    19 Mar 2007 18:29:56 -0000      1.889
+++ files.el    20 Mar 2007 09:35:42 -0000      1.890
@@ -3595,10 +3595,21 @@
              (let ((filename
                     (expand-file-name
                      (read-file-name "File to save in: ") nil)))
-               (and (file-exists-p filename)
-                    (or (y-or-n-p (format "File `%s' exists; overwrite? "
+               (if (file-exists-p filename)
+                   (if (file-directory-p filename)
+                       ;; Signal an error if the user specified the name of an
+                       ;; existing directory.
+                       (error "%s is a directory" filename)
+                     (unless (y-or-n-p (format "File `%s' exists; overwrite? "
                                           filename))
                         (error "Canceled")))
+                 ;; Signal an error if the specified name refers to a
+                 ;; non-existing directory.
+                 (let ((dir (file-name-directory filename)))
+                   (unless (file-directory-p dir)
+                     (if (file-exists-p dir)
+                         (error "%s is not a directory" dir)
+                       (error "%s: no such directory" dir)))))
                (set-visited-file-name filename)))
          (or (verify-visited-file-modtime (current-buffer))
              (not (file-exists-p buffer-file-name))