aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuri Linkov2010-05-21 02:08:52 +0300
committerJuri Linkov2010-05-21 02:08:52 +0300
commit2e2bbddbf9ac76724f4799c7bf5bf7c056d73951 (patch)
tree5f305b4dd4f98ffa7b961ee5dd97141bfe3c12d0 /src
parentf66a2f90f69e8f8d73f06759cb2ae0fd2850ead3 (diff)
downloademacs-2e2bbddbf9ac76724f4799c7bf5bf7c056d73951.tar.gz
emacs-2e2bbddbf9ac76724f4799c7bf5bf7c056d73951.zip
* 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
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/fileio.c5
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b593f5fe8dd..13ab4682df3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12010-05-20 Juri Linkov <juri@jurta.org>
2
3 * fileio.c (Fdelete_file): Change interative spec to use
4 `read-file-name' like in `find-file-read-args' where the default
5 value is `default-directory' instead of `buffer-file-name'.
6 http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00533.html
7
12010-05-20 Kevin Ryde <user42@zip.com.au> 82010-05-20 Kevin Ryde <user42@zip.com.au>
2 9
3 * keyboard.c (Vlast_command, Vkeyboard_translate_table) 10 * keyboard.c (Vlast_command, Vkeyboard_translate_table)
diff --git a/src/fileio.c b/src/fileio.c
index 85685ebc9c4..de32bfecd34 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2194,7 +2194,10 @@ DEFUN ("delete-directory-internal", Fdelete_directory_internal,
2194 return Qnil; 2194 return Qnil;
2195} 2195}
2196 2196
2197DEFUN ("delete-file", Fdelete_file, Sdelete_file, 1, 2, "fDelete file: \nP", 2197DEFUN ("delete-file", Fdelete_file, Sdelete_file, 1, 2,
2198 "(list (read-file-name \"Delete file: \" nil default-directory \
2199 (confirm-nonexistent-file-or-buffer)) \
2200 current-prefix-arg)",
2198 doc: /* Delete file named FILENAME. If it is a symlink, remove the symlink. 2201 doc: /* Delete file named FILENAME. If it is a symlink, remove the symlink.
2199If file has multiple names, it continues to exist with the other names. 2202If file has multiple names, it continues to exist with the other names.
2200 2203