Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
b242dbfc
Commit
b242dbfc
authored
Jan 28, 2010
by
Chong Yidong
Browse files
* fileio.c (Frename_file): Fix last change (Bug#5487).
parent
ca0eb708
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
src/ChangeLog
src/ChangeLog
+2
-0
src/fileio.c
src/fileio.c
+2
-2
No files found.
src/ChangeLog
View file @
b242dbfc
2010-01-28 Chong Yidong <cyd@stupidchicken.com>
* fileio.c (Frename_file): Fix last change (Bug#5487).
* m/mips.h: Remove DATA_START. Suggested by Dan Nicolaescu.
* m/alpha.h: Don't define DATA_START on NetBSD (Bug#4629).
...
...
src/fileio.c
View file @
b242dbfc
...
...
@@ -2289,7 +2289,7 @@ This is what happens in interactive use with M-x. */)
NILP
(
ok_if_already_exists
)
?
Qnil
:
Qt
);
else
#endif
if
(
Ffile_directory_p
(
file
))
if
(
!
NILP
(
Ffile_directory_p
(
file
))
)
call4
(
Qcopy_directory
,
file
,
newname
,
Qt
,
Qnil
);
else
/* We have already prompted if it was an integer, so don't
...
...
@@ -2300,7 +2300,7 @@ This is what happens in interactive use with M-x. */)
count
=
SPECPDL_INDEX
();
specbind
(
Qdelete_by_moving_to_trash
,
Qnil
);
if
(
Ffile_directory_p
(
file
))
if
(
!
NILP
(
Ffile_directory_p
(
file
))
)
call2
(
Qdelete_directory
,
file
,
Qt
);
else
Fdelete_file
(
file
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment