bug#5487: 23.1.91; rename-file is broken

bug#5487: 23.1.91; rename-file is broken

[Stephen Berman]

1. Make a non-directory file "test" in ~.
2. emacs -Q
3. M-x rename-file RET ~/test RET /some-dir-on-a-different-partition
=>error "copy-directory: Opening directory: not a directory, /home/steve/test"

The file "test" remains in ~, and in /some-dir-on-a-different-partition
there is a new empty directory "test".

I strongly suspect this is due to this change (but I haven't had time to
revert it and rebuild Emacs to test my suspicion):

2010-01-27  David De La Harpe Golden  <david@harpegolden.net>

	* fileio.c (Frename_file): Call copy-directory and
	delete-directory for directories, in order to handle cross-device
	renaming (Bug#3353).


In GNU Emacs 23.1.91.3 (i686-pc-linux-gnu, GTK+ Version 2.18.1)
 of 2010-01-27 on escher
Windowing system distributor `The X.Org Foundation', version 11.0.10605000
Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: en_US.UTF-8
  value of $XMODIFIERS: @im=local
  locale-coding-system: utf-8-unix
  default enable-multibyte-characters: t

bug#5487: 23.1.91; rename-file is broken

[Chong Yidong]

> 1. Make a non-directory file "test" in ~.
> 2. emacs -Q
> 3. M-x rename-file RET ~/test RET /some-dir-on-a-different-partition
> =>error "copy-directory: Opening directory: not a directory, /home/steve/test"

Sorry, there was a bug in the latest change to Frename_file.  (I
actually spotted it in the patch, but forgot to fix it before applying
to the repository.)  Should be fixed now.

bug#5487: 23.1.91; rename-file is broken

[Stephen Berman]

On Thu, 28 Jan 2010 12:48:26 -0500 Chong Yidong <cyd@stupidchicken.com> wrote:

>> 1. Make a non-directory file "test" in ~.
>> 2. emacs -Q
>> 3. M-x rename-file RET ~/test RET /some-dir-on-a-different-partition
>> =>error "copy-directory: Opening directory: not a directory, /home/steve/test"
>
> Sorry, there was a bug in the latest change to Frename_file.  (I
> actually spotted it in the patch, but forgot to fix it before applying
> to the repository.)  Should be fixed now.

It is; thanks!

Steve Berman