summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/dired-aux.el2
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1dc72289788..02cc24a2a36 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2014-02-09 Lars Ingebrigtsen <larsi@gnus.org>
+ * dired-aux.el (dired-copy-file-recursive): Remove slighly
+ misleading comment (bug#11328).
+
* repeat.el (repeat-message-function): Reword doc slightly (bug#11619).
* icomplete.el (icomplete-with-completion-tables): Doc fix (bug#11654).
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 8f1a4be9d50..c8e29b5ad96 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1343,9 +1343,7 @@ Special value `always' suppresses confirmation."
(eq t (car attrs))
(or (eq recursive 'always)
(yes-or-no-p (format "Recursive copies of %s? " from))))
- ;; This is a directory.
(copy-directory from to preserve-time)
- ;; Not a directory.
(or top (dired-handle-overwrite to))
(condition-case err
(if (stringp (car attrs))