2 files changed, 21 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee4eae0e41b..286f1eeae65 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-29  Chong Yidong  <cyd@stupidchicken.com>
+
+        * files.el (copy-directory): If destination is an existing
+        directory, copy into a subdirectory there.
+
 2011-01-29  Andreas Schwab  <schwab@linux-m68k.org>
 
         * emacs-lisp/shadow.el (load-path-shadows-find): Ignore leim-list
diff --git a/lisp/files.el b/lisp/files.el
index ee77975e38b..46597426191 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4756,7 +4756,22 @@ this happens by default."
       ;; Compute target name.
       (setq directory (directory-file-name (expand-file-name directory))
             newname   (directory-file-name (expand-file-name newname)))
-      (if (not (file-directory-p newname)) (make-directory newname parents))
+
+      (if (not (file-directory-p newname))
+          ;; If NEWNAME is not an existing directory, create it; that
+          ;; is where we will copy the files of DIRECTORY.
+          (make-directory newname parents)
+        ;; If NEWNAME is an existing directory, we will copy into
+        ;; NEWNAME/[DIRECTORY-BASENAME].
+        (setq newname (expand-file-name
+                       (file-name-nondirectory
+                        (directory-file-name directory))
+                       newname))
+        (if (and (file-exists-p newname)
+                 (not (file-directory-p newname)))
+            (error "Cannot overwrite non-directory %s with a directory"
+                   newname))
+        (make-directory newname t))
 
       ;; Copy recursively.
       (mapc