]> git.eshelyaron.com Git - emacs.git/commitdiff
Adapt dired-create-files to copy-directory changes.
authorThierry Volpiatto <thierry.volpiatto@gmail.com>
Sat, 12 Feb 2011 22:55:28 +0000 (17:55 -0500)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 12 Feb 2011 22:55:28 +0000 (17:55 -0500)
* dired-aux.el (dired-create-files): Adapt destination name to
match the new behavior of copy-directory.

lisp/ChangeLog
lisp/dired-aux.el

index 7cd39ae6d4bd157fc347c06075cd1bf6e8ff53b6..d0529bc00f156baa0e4e663ddd3447074c1bd977 100644 (file)
@@ -1,3 +1,8 @@
+2011-02-12  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+       * dired-aux.el (dired-create-files): Adapt destination name to
+       match the new behavior of copy-directory.
+
 2011-02-12  Chong Yidong  <cyd@stupidchicken.com>
 
        * mail/mail-utils.el (mail-dont-reply-to-names): New variable,
index 6f33831eb38f21b46692d4f1d86443a256daccb9..cb1324051a727a345a51c5208e82c4de288b4591 100644 (file)
@@ -1383,6 +1383,10 @@ ESC or `q' to not overwrite any of the remaining files,
                   (cond  ((integerp marker-char) marker-char)
                          (marker-char (dired-file-marker from)) ; slow
                          (t nil))))
+           (when (and (file-directory-p from)
+                      (file-directory-p to)
+                      (eq file-creator 'dired-copy-file))
+             (setq to (file-name-directory to)))
             (condition-case err
                 (progn
                   (funcall file-creator from to dired-overwrite-confirmed)