aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2017-09-20 11:49:12 -0700
committerPaul Eggert2017-09-20 11:50:35 -0700
commit047f02f00f602b9aef63ae8938e12f3f0ab481eb (patch)
tree05bb7bce7b212be58d92af124224adb8756329ad /lisp
parentfbd15836af69b1d156f39664f2512f85278fdb08 (diff)
downloademacs-047f02f00f602b9aef63ae8938e12f3f0ab481eb.tar.gz
emacs-047f02f00f602b9aef63ae8938e12f3f0ab481eb.zip
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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/files.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/files.el b/lisp/files.el
index 0c30d40c13b..f0a1f2380d9 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5564,7 +5564,7 @@ into NEWNAME instead."
5564 (filetype (car (file-attributes file)))) 5564 (filetype (car (file-attributes file))))
5565 (cond 5565 (cond
5566 ((eq filetype t) ; Directory but not a symlink. 5566 ((eq filetype t) ; Directory but not a symlink.
5567 (copy-directory file newname keep-time parents)) 5567 (copy-directory file target keep-time parents t))
5568 ((stringp filetype) ; Symbolic link 5568 ((stringp filetype) ; Symbolic link
5569 (make-symbolic-link filetype target t)) 5569 (make-symbolic-link filetype target t))
5570 ((copy-file file target t keep-time))))) 5570 ((copy-file file target t keep-time)))))