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 @@
 
 2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * files.el (make-directory): Clarify that an error will be raised
+        if there's an error (bug#6397).
+
         * startup.el (initial-buffer-choice): Add `none' as a choice
         (bug#6234).
 
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.
 
 Noninteractively, the second (optional) argument PARENTS, if
 non-nil, says whether to create parent directories that don't
-exist.  Interactively, this happens by default."
+exist.  Interactively, this happens by default.
+
+If creating the directory or directories fail, an error will be
+raised."
   (interactive
    (list (read-file-name "Make directory: " default-directory default-directory
                          nil nil)