aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1994-09-16 22:17:40 +0000
committerKarl Heuer1994-09-16 22:17:40 +0000
commit1b50b4f279a168d3d174d4affc20f13e149d083d (patch)
tree17b5c012874fc957d3ff33201fc60d1fd36ca8e0 /src
parentb7abc8faa69806f7015e5b6813cea8ec4adf22c3 (diff)
downloademacs-1b50b4f279a168d3d174d4affc20f13e149d083d.tar.gz
emacs-1b50b4f279a168d3d174d4affc20f13e149d083d.zip
(Fdelete_file): Bind completion-ignored-extensions to nil.
Diffstat (limited to 'src')
-rw-r--r--src/fileio.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 036f9041a21..eac15ce94ff 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -150,6 +150,8 @@ int vms_stmlf_recfm;
150static Lisp_Object Vinhibit_file_name_handlers; 150static Lisp_Object Vinhibit_file_name_handlers;
151static Lisp_Object Vinhibit_file_name_operation; 151static Lisp_Object Vinhibit_file_name_operation;
152 152
153extern Lisp_Object Qcompletion_ignored_extensions;
154
153Lisp_Object Qfile_error, Qfile_already_exists; 155Lisp_Object Qfile_error, Qfile_already_exists;
154 156
155Lisp_Object Qfile_name_history; 157Lisp_Object Qfile_name_history;
@@ -1902,17 +1904,19 @@ If file has multiple names, it continues to exist with the other names.")
1902 (filename) 1904 (filename)
1903 Lisp_Object filename; 1905 Lisp_Object filename;
1904{ 1906{
1907 int count = specpdl_ptr - specpdl;
1905 Lisp_Object handler; 1908 Lisp_Object handler;
1906 CHECK_STRING (filename, 0); 1909 CHECK_STRING (filename, 0);
1907 filename = Fexpand_file_name (filename, Qnil); 1910 filename = Fexpand_file_name (filename, Qnil);
1908 1911
1912 specbind (Qcompletion_ignored_extensions, Qnil);
1909 handler = Ffind_file_name_handler (filename, Qdelete_file); 1913 handler = Ffind_file_name_handler (filename, Qdelete_file);
1910 if (!NILP (handler)) 1914 if (!NILP (handler))
1911 return call2 (handler, Qdelete_file, filename); 1915 return unbind_to (count, call2 (handler, Qdelete_file, filename));
1912 1916
1913 if (0 > unlink (XSTRING (filename)->data)) 1917 if (0 > unlink (XSTRING (filename)->data))
1914 report_file_error ("Removing old name", Flist (1, &filename)); 1918 report_file_error ("Removing old name", Flist (1, &filename));
1915 return Qnil; 1919 return unbind_to (count, Qnil);
1916} 1920}
1917 1921
1918DEFUN ("rename-file", Frename_file, Srename_file, 2, 3, 1922DEFUN ("rename-file", Frename_file, Srename_file, 2, 3,