* files.texi (Directories): delete-directory has an optional

parameter RECURSIVE.

4 files changed, 16 insertions, 3 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index f654490f5c6..1fcb1d3533a 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-01  Michael Albinus  <michael.albinus@gmx.de>
+
+        * files.texi (Create/Delete Dirs): delete-directory has an
+        optional parameter RECURSIVE.
+
 2009-10-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * buffers.texi (Swapping Text): Minor clarification.
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index cbba096c7b9..81f342aee97 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -2501,11 +2501,12 @@ if they don't already exist.
 @code{mkdir} is an alias for this.
 @end deffn
 
-@deffn Command delete-directory dirname
+@deffn Command delete-directory dirname &optional recursive
 This command deletes the directory named @var{dirname}.  The function
 @code{delete-file} does not work for files that are directories; you
-must use @code{delete-directory} for them.  If the directory contains
-any files, @code{delete-directory} signals an error.
+must use @code{delete-directory} for them.  If @var{recursive} is
+@code{nil}, and the directory contains any files,
+@code{delete-directory} signals an error.
 
 @code{delete-directory} only follows symbolic links at the level of
 parent directories.
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 9becb86ce37..861b2064e7f 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-01  Michael Albinus  <michael.albinus@gmx.de>
+
+        * NEWS: delete-directory has an optional parameter RECURSIVE.
+
 2009-10-01  Carsten Dominik  <dominik@u016822.science.uva.nl>
 
         * refcards/orgcard.tex: New version number.
diff --git a/etc/NEWS b/etc/NEWS
index 093ca72b2a5..9003f42ee96 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -302,6 +302,9 @@ be in use:
   time-stamp-yyyy-mm-dd, time-stamp-yymmdd, time-stamp-hh:mm:ss,
   time-stamp-hhmm, baud-rate
 
+** `delete-directory' has an optional parameter RECURSIVE.
+
+
 * Changes in Emacs 23.2 on non-free operating systems
 
 ---