From: Chong Yidong Date: Sat, 29 Jan 2011 22:10:51 +0000 (-0500) Subject: Fix bug in copy-directory copying into an existing directory. X-Git-Tag: emacs-pretest-23.2.93~6 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82d84d3fc97ed20079b42bb2b2c319437a299ad9;p=emacs.git Fix bug in copy-directory copying into an existing directory. http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg01007.html * files.el (copy-directory): If destination is an existing directory, copy into a subdirectory there. --- 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 + + * files.el (copy-directory): If destination is an existing + directory, copy into a subdirectory there. + 2011-01-29 Andreas Schwab * 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