* fileio.c (Fdelete_file): Change interative spec to use

`read-file-name' like in `find-file-read-args' where the default
value is `default-directory' instead of `buffer-file-name'.
http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00533.html

diff --git a/src/ChangeLog b/src/ChangeLog
index b593f5fe8dde53c6873173aecf2aa6271a1a0999..13ab4682df33ce64902a96871930796970de7099 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-20  Juri Linkov  <juri@jurta.org>
+
+       * fileio.c (Fdelete_file): Change interative spec to use
+       `read-file-name' like in `find-file-read-args' where the default
+       value is `default-directory' instead of `buffer-file-name'.
+       http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00533.html
+
 2010-05-20  Kevin Ryde  <user42@zip.com.au>
 
        * keyboard.c (Vlast_command, Vkeyboard_translate_table)

diff --git a/src/fileio.c b/src/fileio.c
index 85685ebc9c46aab82a80a62ad0b67ddca7d5f6a3..de32bfecd349d6364ec554e25604007af40da75e 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2194,7 +2194,10 @@ DEFUN ("delete-directory-internal", Fdelete_directory_internal,
   return Qnil;
 }
 
-DEFUN ("delete-file", Fdelete_file, Sdelete_file, 1, 2, "fDelete file: \nP",
+DEFUN ("delete-file", Fdelete_file, Sdelete_file, 1, 2,
+       "(list (read-file-name \"Delete file: \" nil default-directory \
+                (confirm-nonexistent-file-or-buffer))                 \
+              current-prefix-arg)",
        doc: /* Delete file named FILENAME.  If it is a symlink, remove the symlink.
 If file has multiple names, it continues to exist with the other names.