summaryrefslogtreecommitdiff
path: root/lisp/files.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-02-25 09:29:41 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2013-02-25 09:29:41 -0500
commit944c37effa068de90af84c37106461bca3076bea (patch)
treef1f1d775171addda0ebdb1b21076c67ff1aa69bc /lisp/files.el
parentce9ae7ca92bf6836d69644e34b98d52b3316da67 (diff)
downloademacs-944c37effa068de90af84c37106461bca3076bea.tar.gz
* lisp/files.el (basic-save-buffer): Remove redundant directory-creation.
Diffstat (limited to 'lisp/files.el')
-rw-r--r--lisp/files.el39
1 files changed, 14 insertions, 25 deletions
diff --git a/lisp/files.el b/lisp/files.el
index f9d02511839..cbc6e59c442 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4563,32 +4563,21 @@ Before and after saving the buffer, this function runs
(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