[Emacs-diffs] /srv/bzr/emacs/trunk r103241: Adapt dired-create-files to copy-directory changes.

[Chong Yidong]

------------------------------------------------------------
revno: 103241
author: Thierry Volpiatto <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-12 17:55:28 -0500
message:
  Adapt dired-create-files to copy-directory changes.
  
  * dired-aux.el (dired-create-files): Adapt destination name to
  match the new behavior of copy-directory.
modified:
  lisp/ChangeLog
  lisp/dired-aux.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-12 21:45:42 +0000
+++ b/lisp/ChangeLog    2011-02-12 22:55:28 +0000
@@ -1,3 +1,8 @@
+2011-02-12  Thierry Volpiatto  <address@hidden>
+
+       * dired-aux.el (dired-create-files): Adapt destination name to
+       match the new behavior of copy-directory.
+
 2011-02-12  Chong Yidong  <address@hidden>
 
        * mail/mail-utils.el (mail-dont-reply-to-names): New variable,

=== modified file 'lisp/dired-aux.el'
--- a/lisp/dired-aux.el 2011-01-25 04:08:28 +0000
+++ b/lisp/dired-aux.el 2011-02-12 22:55:28 +0000
@@ -1383,6 +1383,10 @@
                   (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)