Fix new copy-directory bug with empty dirs

Problem reported by Afdam Plaice (Bug#28520) and by Eli Zaretskii
(Bug#28483#34).  This is another bug that I introduced in my
recent copy-directory changes.
* lisp/files.el (copy-directory): Work with empty subdirectories, too.
* test/lisp/files-tests.el (files-tests--copy-directory):
Test for this bug.

diff --git a/lisp/files.el b/lisp/files.el
index 0c30d40c13b329fec457752d7fce6734798c466d..f0a1f2380d9fa4b831ebfb84d8d8f0c123ebaf9a 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5564,7 +5564,7 @@ into NEWNAME instead."
              (filetype (car (file-attributes file))))
          (cond
           ((eq filetype t)       ; Directory but not a symlink.
-           (copy-directory file newname keep-time parents))
+           (copy-directory file target keep-time parents t))
           ((stringp filetype)    ; Symbolic link
            (make-symbolic-link filetype target t))
           ((copy-file file target t keep-time)))))

diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index f2a9a321808f9691e8ea7e2372110b7c64b77f10..285a884b6958b4491a6258451495fa92e38e9f34 100644 (file)
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -399,11 +399,16 @@ name (Bug#28412)."
         (dirname (file-name-as-directory dir))
         (source (concat dirname "source"))
         (dest (concat dirname "dest/new/directory/"))
-        (file (concat (file-name-as-directory source) "file")))
+        (file (concat (file-name-as-directory source) "file"))
+        (source2 (concat dirname "source2"))
+        (dest2 (concat dirname "dest/new2")))
     (make-directory source)
     (write-region "" nil file)
     (copy-directory source dest t t t)
     (should (file-exists-p (concat dest "file")))
+    (make-directory (concat (file-name-as-directory source2) "a") t)
+    (copy-directory source2 dest2)
+    (should (file-directory-p (concat (file-name-as-directory dest2) "a")))
     (delete-directory dir 'recursive)))
 
 (provide 'files-tests)