comparison lisp/files.el @ 106808:390461140f6c

* files.el (copy-directory): Compute target for recursive directories with identical names. (Bug#5343)

106807:8f9c3a09d55a

	(funcall handler 'copy-directory directory newname keep-time parents)

      ;; Compute target name.
      (setq directory (directory-file-name (expand-file-name directory))
	    newname   (directory-file-name (expand-file-name newname)))
      (if (and (file-directory-p newname)
	       (not (string-equal (file-name-nondirectory directory)
				  (file-name-nondirectory newname))))
	  (setq newname
		(expand-file-name (file-name-nondirectory directory) newname)))
      (if (not (file-directory-p newname)) (make-directory newname parents))

      ;; Copy recursively.
      (mapc
       (lambda (file)
	 (if (file-directory-p file)
	     (copy-directory file newname keep-time parents)
	   (copy-file file newname t keep-time)))
       ;; We do not want to delete "." and "..".
       (directory-files	directory 'full directory-files-no-dot-files-regexp))

      ;; Set directory attributes.
      (set-file-modes newname (file-modes directory))
      (if keep-time

106808:390461140f6c

	(funcall handler 'copy-directory directory newname keep-time parents)

      ;; 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))

      ;; Copy recursively.
      (mapc
       (lambda (file)
	 (let ((target (expand-file-name
			(file-name-nondirectory file) newname)))
	   (if (file-directory-p file)
	       (copy-directory file target keep-time parents)
	     (copy-file file target t keep-time))))
       ;; We do not want to copy "." and "..".
       (directory-files	directory 'full directory-files-no-dot-files-regexp))

      ;; Set directory attributes.
      (set-file-modes newname (file-modes directory))
      (if keep-time