mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/android

Browse source
This commit is contained in:
Po Lu 2023-08-07 07:56:44 +08:00
commit 072a8a434e
6 changed files with 59 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/fileio.c
View file

@ -2566,12 +2566,14 @@ DEFUN ("delete-directory-internal", Fdelete_directory_internal,
}
DEFUN ("delete-file-internal", Fdelete_file_internal, Sdelete_file_internal, 1, 1, 0,
doc: /* Delete file named FILENAME. If it is a symlink, remove the symlink.
doc: /* Delete file named FILENAME; internal use only.
If it is a symlink, remove the symlink.
If file has multiple names, it continues to exist with the other names. */)
(Lisp_Object filename)
{
Lisp_Object encoded_file;
filename = Fexpand_file_name (filename, Qnil);
encoded_file = ENCODE_FILE (filename);
if (emacs_unlink (SSDATA (encoded_file)) != 0
@ -2596,7 +2598,7 @@ internal_delete_file (Lisp_Object filename)
{
Lisp_Object tem;
tem = internal_condition_case_2 (Fdelete_file, filename, Qnil,
tem = internal_condition_case_2 (Fdelete_file_internal, filename,
Qt, internal_delete_file_1);
return NILP (tem);
}