aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-14 00:22:08 +0200
committerLars Magne Ingebrigtsen2011-07-14 00:22:08 +0200
commitbd2fcc8d5cb29bfce6a4f30c8aa42feb3b24706f (patch)
treea1d6033b3241abc962f78135a168c13034f61b33
parentbee0fcef3d9c332b9907369b4e6f6f61d6fbdf35 (diff)
downloademacs-bd2fcc8d5cb29bfce6a4f30c8aa42feb3b24706f.tar.gz
emacs-bd2fcc8d5cb29bfce6a4f30c8aa42feb3b24706f.zip
(make-directory): Clarify that an error will be raised if there's an error
Fixes: debbugs:6387
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/files.el5
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17cbc948536..00a48ff73c1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,9 @@
8 8
92011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org> 92011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
10 10
11 * files.el (make-directory): Clarify that an error will be raised
12 if there's an error (bug#6397).
13
11 * startup.el (initial-buffer-choice): Add `none' as a choice 14 * startup.el (initial-buffer-choice): Add `none' as a choice
12 (bug#6234). 15 (bug#6234).
13 16
diff --git a/lisp/files.el b/lisp/files.el
index bf38ce39a07..0b253fcc297 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4778,7 +4778,10 @@ visited a file in a nonexistent directory.
4778 4778
4779Noninteractively, the second (optional) argument PARENTS, if 4779Noninteractively, the second (optional) argument PARENTS, if
4780non-nil, says whether to create parent directories that don't 4780non-nil, says whether to create parent directories that don't
4781exist. Interactively, this happens by default." 4781exist. Interactively, this happens by default.
4782
4783If creating the directory or directories fail, an error will be
4784raised."
4782 (interactive 4785 (interactive
4783 (list (read-file-name "Make directory: " default-directory default-directory 4786 (list (read-file-name "Make directory: " default-directory default-directory
4784 nil nil) 4787 nil nil)