[Emacs-diffs] /srv/bzr/emacs/trunk r111873: * lisp/files.el (basic-save-buffer): Remove redundant directory-creation.

[Stefan Monnier]

------------------------------------------------------------
revno: 111873
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-02-25 09:29:41 -0500
message:
  * lisp/files.el (basic-save-buffer): Remove redundant directory-creation.
modified:
  lisp/ChangeLog
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-24 01:05:13 +0000
+++ b/lisp/ChangeLog    2013-02-25 14:29:41 +0000
@@ -1,3 +1,7 @@
+2013-02-25  Stefan Monnier  <address@hidden>
+
+       * files.el (basic-save-buffer): Remove redundant directory-creation.
+
 2013-02-24  Jay Belanger  <address@hidden>
 
        * calc/calc-ext.el (math-to-radians-2, math-from-radians-2):

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2013-02-21 02:44:06 +0000
+++ b/lisp/files.el     2013-02-25 14:29:41 +0000
@@ -4563,32 +4563,21 @@
                 (not (file-exists-p buffer-file-name))))
        (let ((recent-save (recent-auto-save-p))
              setmodes)
-           ;; If buffer has no file name, ask user for one.
+          ;; If buffer has no file name, ask user for one.
          (or buffer-file-name
-           (let ((filename
-                  (expand-file-name
-                   (read-file-name "File to save in: "
-                                   nil (expand-file-name (buffer-name))))))
-             (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)
-                     (if (y-or-n-p
-                          (format "Directory `%s' does not exist; create? "
-                                  dir))
-                         (make-directory dir t)
-                       (error "Canceled"))))))
-             (set-visited-file-name filename)))
+              (let ((filename
+                     (expand-file-name
+                      (read-file-name "File to save in: "
+                                      nil (expand-file-name (buffer-name))))))
+                (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"))))
+                (set-visited-file-name filename)))
          (or (verify-visited-file-modtime (current-buffer))
              (not (file-exists-p buffer-file-name))
              (yes-or-no-p