diff options
| author | Karl Heuer | 1994-09-28 20:45:08 +0000 |
|---|---|---|
| committer | Karl Heuer | 1994-09-28 20:45:08 +0000 |
| commit | 8a9b0da95ae651715f717ef85a98d55fbc3c4ae7 (patch) | |
| tree | b16104de15f92f3cf86acf5f41f11c23900d49a4 /src | |
| parent | b0e1e38fa97ce784a95382a5d8fb20440fac97c2 (diff) | |
| download | emacs-8a9b0da95ae651715f717ef85a98d55fbc3c4ae7.tar.gz emacs-8a9b0da95ae651715f717ef85a98d55fbc3c4ae7.zip | |
(Fdelete_file): Undo Sep 16 change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fileio.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/fileio.c b/src/fileio.c index 401e569b463..a06032a3cae 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -150,8 +150,6 @@ int vms_stmlf_recfm; | |||
| 150 | static Lisp_Object Vinhibit_file_name_handlers; | 150 | static Lisp_Object Vinhibit_file_name_handlers; |
| 151 | static Lisp_Object Vinhibit_file_name_operation; | 151 | static Lisp_Object Vinhibit_file_name_operation; |
| 152 | 152 | ||
| 153 | extern Lisp_Object Qcompletion_ignored_extensions; | ||
| 154 | |||
| 155 | Lisp_Object Qfile_error, Qfile_already_exists; | 153 | Lisp_Object Qfile_error, Qfile_already_exists; |
| 156 | 154 | ||
| 157 | Lisp_Object Qfile_name_history; | 155 | Lisp_Object Qfile_name_history; |
| @@ -1905,19 +1903,17 @@ If file has multiple names, it continues to exist with the other names.") | |||
| 1905 | (filename) | 1903 | (filename) |
| 1906 | Lisp_Object filename; | 1904 | Lisp_Object filename; |
| 1907 | { | 1905 | { |
| 1908 | int count = specpdl_ptr - specpdl; | ||
| 1909 | Lisp_Object handler; | 1906 | Lisp_Object handler; |
| 1910 | CHECK_STRING (filename, 0); | 1907 | CHECK_STRING (filename, 0); |
| 1911 | filename = Fexpand_file_name (filename, Qnil); | 1908 | filename = Fexpand_file_name (filename, Qnil); |
| 1912 | 1909 | ||
| 1913 | specbind (Qcompletion_ignored_extensions, Qnil); | ||
| 1914 | handler = Ffind_file_name_handler (filename, Qdelete_file); | 1910 | handler = Ffind_file_name_handler (filename, Qdelete_file); |
| 1915 | if (!NILP (handler)) | 1911 | if (!NILP (handler)) |
| 1916 | return unbind_to (count, call2 (handler, Qdelete_file, filename)); | 1912 | return call2 (handler, Qdelete_file, filename); |
| 1917 | 1913 | ||
| 1918 | if (0 > unlink (XSTRING (filename)->data)) | 1914 | if (0 > unlink (XSTRING (filename)->data)) |
| 1919 | report_file_error ("Removing old name", Flist (1, &filename)); | 1915 | report_file_error ("Removing old name", Flist (1, &filename)); |
| 1920 | return unbind_to (count, Qnil); | 1916 | return Qnil; |
| 1921 | } | 1917 | } |
| 1922 | 1918 | ||
| 1923 | DEFUN ("rename-file", Frename_file, Srename_file, 2, 3, | 1919 | DEFUN ("rename-file", Frename_file, Srename_file, 2, 3, |