From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 22 May 1994 01:40:44 +0000 (+0000)
Subject: (Fdelete_directory): Allow dir names as well as file names.
X-Git-Tag: emacs-19.34~8242
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1691b32b5923469f1ddd8be7f626d4869f8279b4;p=emacs.git

(Fdelete_directory): Allow dir names as well as file names.
---

diff --git a/src/fileio.c b/src/fileio.c
index 8d02ca3fdaa..79bd39161af 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1856,7 +1856,7 @@ DEFUN ("make-directory-internal", Fmake_directory_internal,
 }
 
 DEFUN ("delete-directory", Fdelete_directory, Sdelete_directory, 1, 1, "FDelete directory: ",
-  "Delete a directory.  One argument, a file name string.")
+  "Delete a directory.  One argument, a file name or directory name string.")
   (dirname)
      Lisp_Object dirname;
 {
@@ -1864,7 +1864,7 @@ DEFUN ("delete-directory", Fdelete_directory, Sdelete_directory, 1, 1, "FDelete
   Lisp_Object handler;
 
   CHECK_STRING (dirname, 0);
-  dirname = Fexpand_file_name (dirname, Qnil);
+  dirname = Fdirectory_file_name (Fexpand_file_name (dirname, Qnil));
   dir = XSTRING (dirname)->data;
 
   handler = Ffind_file_name_handler (dirname, Qdelete_directory);